archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Follow up on bug #75574 for FCGI side

Browse source
This commit is contained in:
Anatol Belski 2017-11-28 20:31:48 +01:00
parent 2873316d1d
commit 8b57a5bca0
3 changed files with 83 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

42
sapi/cgi/cgi_main.c
View file

@ -530,9 +530,47 @@ static size_t sapi_fcgi_read_post(char *buffer, size_t count_bytes)
return read_bytes;
}
#ifdef PHP_WIN32
/* The result needs to be freed! See sapi_getenv(). */
static char *cgi_getenv_win32(const char *name, size_t name_len)
{
char *ret = NULL;
wchar_t *keyw, *valw;
size_t size;
int rc;
keyw = php_win32_cp_conv_any_to_w(name, name_len, PHP_WIN32_CP_IGNORE_LEN_P);
if (!keyw) {
return NULL;
}
rc = _wgetenv_s(&size, NULL, 0, keyw);
if (rc || 0 == size) {
free(keyw);
return NULL;
}
valw = emalloc((size + 1) * sizeof(wchar_t));
rc = _wgetenv_s(&size, valw, size, keyw);
if (!rc) {
ret = php_win32_cp_w_to_any(valw);
}
free(keyw);
efree(valw);
return ret;
}
#endif
static char *sapi_cgi_getenv(char *name, size_t name_len)
{
#ifndef PHP_WIN32
return getenv(name);
#else
return cgi_getenv_win32(name, name_len);
#endif
}
static char *sapi_fcgi_getenv(char *name, size_t name_len)
@ -547,7 +585,11 @@ static char *sapi_fcgi_getenv(char *name, size_t name_len)
if (ret) return ret;
/* if cgi, or fastcgi and not found in fcgi env
check the regular environment */
#ifndef PHP_WIN32
return getenv(name);
#else
return cgi_getenv_win32(name, name_len);
#endif
}
static char *_sapi_cgi_putenv(char *name, size_t name_len, char *value)