diff options
| author | Anatol Belski <ab@php.net> | 2017-11-28 20:34:44 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-11-28 20:34:44 +0100 |
| commit | 0b3046176403c5a32946ccc426d023df019a483b (patch) | |
| tree | fc9fcb51e6b96ec0cb50fe784530a30f5ea2468b /main/SAPI.c | |
| parent | 7c043fff531f853a93c438aa4c05312e863163b0 (diff) | |
| parent | 8b57a5bca0c5a9ba064aa27e7614d1a11c0cac6d (diff) | |
| download | php-git-0b3046176403c5a32946ccc426d023df019a483b.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Follow up on bug #75574 for FCGI side
Diffstat (limited to 'main/SAPI.c')
| -rw-r--r-- | main/SAPI.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index c841c6e789..aec4e30d31 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -1027,6 +1027,12 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len) char *value, *tmp = sapi_module.getenv(name, name_len); if (tmp) { value = estrdup(tmp); +#ifdef PHP_WIN32 + if (strlen(sapi_module.name) == sizeof("cgi-fcgi") - 1 && !strcmp(sapi_module.name, "cgi-fcgi")) { + /* XXX more modules to go, if needed. */ + free(tmp); + } +#endif } else { return NULL; } |