diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-12-13 13:40:42 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-12-13 13:40:42 +0400 |
| commit | 4b1b11563396012797f7729cd6fe8172bf3ca08d (patch) | |
| tree | 6bfc9723707ca1a8c5405d8aeb2bc5cb68cfbf63 | |
| parent | 4d2593e1beefc41632dc775a3c98603b46751442 (diff) | |
| parent | 35f86d24d81b81e8c755e82d0b2e76d36f4a0201 (diff) | |
| download | php-git-4b1b11563396012797f7729cd6fe8172bf3ca08d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
Conflicts:
NEWS
| -rw-r--r-- | main/SAPI.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index fc4b7bee84..e72eafb066 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -1017,7 +1017,7 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC) return NULL; } if (sapi_module.input_filter) { - sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC); + sapi_module.input_filter(PARSE_STRING, name, &value, strlen(value), NULL TSRMLS_CC); } return value; } |