diff options
| author | Dmitry Stogov <dmitry@php.net> | 2012-02-14 13:31:23 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2012-02-14 13:31:23 +0000 |
| commit | 2e94124494c2da4c6ff5d553fda3d2590204435d (patch) | |
| tree | 799a62f4e5d6839064416300bee0316c006b0bf2 /sapi/cgi | |
| parent | ec9fe66069d08b55cf106e35dcd493db884157ac (diff) | |
| download | php-git-2e94124494c2da4c6ff5d553fda3d2590204435d.tar.gz | |
Fixed reinitialization of SAPI callbacks after php_module_startup()
Diffstat (limited to 'sapi/cgi')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 1a073fc509..4643882e69 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1859,6 +1859,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 @@ -1928,13 +1937,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")); |