com php-src: Fix globals initialization in sapi/cgi: sapi/cgi/cgi_main.c

From: Date: Fri, 23 Oct 2015 11:56:40 +0000
Subject: com php-src: Fix globals initialization in sapi/cgi: sapi/cgi/cgi_main.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89492@lists.php.net to get a copy of this message
Commit: 22af88274b93c03fd9f9b0fb443abf6b586d947b Author: Anatol Belski <ab@php.net> Fri, 23 Oct 2015 13:56:40 +0200 Parents: afd31489d0d9999f701467e99ef2b40794eed196 Branches: PHP-5.6 PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=22af88274b93c03fd9f9b0fb443abf6b586d947b Log: Fix globals initialization in sapi/cgi Basically backport 8430ec17 Changed paths: M sapi/cgi/cgi_main.c Diff: diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index de1be31..1c0b489 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1493,11 +1493,6 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals TSRMLS_ */ static PHP_MINIT_FUNCTION(cgi) { -#ifdef ZTS - ts_allocate_id(&php_cgi_globals_id, sizeof(php_cgi_globals_struct), (ts_allocate_ctor) php_cgi_globals_ctor, NULL); -#else - php_cgi_globals_ctor(&php_cgi_globals TSRMLS_CC); -#endif REGISTER_INI_ENTRIES(); return SUCCESS; } @@ -1801,6 +1796,12 @@ int main(int argc, char *argv[]) tsrm_ls = ts_resource(0); #endif +#ifdef ZTS + ts_allocate_id(&php_cgi_globals_id, sizeof(php_cgi_globals_struct), (ts_allocate_ctor) php_cgi_globals_ctor, NULL); +#else + php_cgi_globals_ctor(&php_cgi_globals TSRMLS_CC); +#endif + sapi_startup(&cgi_sapi_module); fastcgi = fcgi_is_fastcgi(); cgi_sapi_module.php_ini_path_override = NULL;

« previous php.cvs (#89492) next »