Merge branch 'PHP-5.4'

* PHP-5.4:
  Update NEWS
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
This commit is contained in:
Xinchen Hui 2012-04-06 22:00:15 +08:00
commit 7497aa9c4e

View File

@ -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;