mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Fixed reinitialization of SAPI callbacks after php_module_startup()
This commit is contained in:
parent
f60145a1a2
commit
106e88b3db
4
NEWS
4
NEWS
@ -7,6 +7,10 @@ PHP NEWS
|
||||
. Fixed bug #60965 (Buffer overflow on htmlspecialchars/entities with
|
||||
$double=false). (Gustavo)
|
||||
|
||||
- CGI/FastCGI SAPI
|
||||
. Fixed reinitialization of SAPI callbacks after php_module_startup().
|
||||
(Dmitry)
|
||||
|
||||
02 Feb 2012, PHP 5.4.0 RC 7
|
||||
- Core:
|
||||
. Fixed bug #60895 (Possible invalid handler usage in windows random
|
||||
|
@ -1860,6 +1860,15 @@ int main(int argc, char *argv[])
|
||||
php_optind = orig_optind;
|
||||
php_optarg = orig_optarg;
|
||||
|
||||
if (fastcgi || bindpath) {
|
||||
/* Override SAPI callbacks */
|
||||
cgi_sapi_module.ub_write = sapi_fcgi_ub_write;
|
||||
cgi_sapi_module.flush = sapi_fcgi_flush;
|
||||
cgi_sapi_module.read_post = sapi_fcgi_read_post;
|
||||
cgi_sapi_module.getenv = sapi_fcgi_getenv;
|
||||
cgi_sapi_module.read_cookies = sapi_fcgi_read_cookies;
|
||||
}
|
||||
|
||||
#ifdef ZTS
|
||||
SG(request_info).path_translated = NULL;
|
||||
#endif
|
||||
@ -1929,13 +1938,6 @@ consult the installation file that came with this distribution, or visit \n\
|
||||
fastcgi = fcgi_is_fastcgi();
|
||||
}
|
||||
if (fastcgi) {
|
||||
/* Override SAPI callbacks */
|
||||
sapi_module.ub_write = sapi_fcgi_ub_write;
|
||||
sapi_module.flush = sapi_fcgi_flush;
|
||||
sapi_module.read_post = sapi_fcgi_read_post;
|
||||
sapi_module.getenv = sapi_fcgi_getenv;
|
||||
sapi_module.read_cookies = sapi_fcgi_read_cookies;
|
||||
|
||||
/* How many times to run PHP scripts before dying */
|
||||
if (getenv("PHP_FCGI_MAX_REQUESTS")) {
|
||||
max_requests = atoi(getenv("PHP_FCGI_MAX_REQUESTS"));
|
||||
|
Loading…
Reference in New Issue
Block a user