Skip to content

Fix #61094 Wrong WSDL cache file name #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joec4i wants to merge 3 commits into from
Closed

Fix #61094 Wrong WSDL cache file name #475

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c02f05a
Fix #61094 Wrong WSDL cache file name
joec4i Sep 27, 2013
fd79a50
Removed the php_get_current_user() call under win32 from ext/soap/php…
joec4i Oct 8, 2013
82b560f
Merge remote-tracking branch 'origin/master'
joec4i Oct 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ext/soap/php_sdl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdlib.h>

#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

#ifndef O_BINARY
# define O_BINARY 0
Expand Down Expand Up @@ -3228,7 +3233,12 @@ sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC)
unsigned char digest[16];
int len = strlen(SOAP_GLOBAL(cache_dir));
time_t cached;
char *user = php_get_current_user(TSRMLS_C);
#ifdef HAVE_UNISTD_H
char user[10]; /* storage for a 32-bit UID */
snprintf(user, 10, "%d", getuid());
#else
char *user = getenv("USERNAME");
#endif
int user_len = user ? strlen(user) + 1 : 0;

md5str[0] = '\0';
Expand Down