diff options
| author | Xinchen Hui <laruence@php.net> | 2012-04-06 22:00:15 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-04-06 22:00:15 +0800 |
| commit | 7497aa9c4e48635b06b7688ecd5c1a9d32b017d4 (patch) | |
| tree | 9d0fa37fc3441291bd12ee46f0f4b529c984578e /main | |
| parent | 8a4ca5289aaf7eea2ff4c9bdb574ae49fc383970 (diff) | |
| parent | 014ed76943071d674cdc308f28b74be18e1caf0c (diff) | |
| download | php-git-7497aa9c4e48635b06b7688ecd5c1a9d32b017d4.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Update NEWS
Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
Diffstat (limited to 'main')
| -rw-r--r-- | main/SAPI.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 0d3b4ef17a..fc4b7bee84 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -1016,7 +1016,9 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC) } else { return NULL; } - sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC); + if (sapi_module.input_filter) { + sapi_module.input_filter(PARSE_ENV, name, &value, strlen(value), NULL TSRMLS_CC); + } return value; } return NULL; |