diff options
| author | Xinchen Hui <laruence@php.net> | 2015-06-29 15:17:58 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-06-29 15:17:58 +0800 |
| commit | a5d38e0deabe0e5b2edcb0255fc921f6be489cbd (patch) | |
| tree | f1120890ed1be672c642c88e54588475699b28ba | |
| parent | 5ba28d76d2e5bfe7aaa9a052898e5f759b84b4ba (diff) | |
| parent | 5e3a3461c25d1222c27cb85a2f41b816887e85f7 (diff) | |
| download | php-git-a5d38e0deabe0e5b2edcb0255fc921f6be489cbd.tar.gz | |
Merge branch 'master' of git.php.net:php-src
| -rw-r--r-- | ext/standard/tests/filters/php_user_filter_01.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/filters/php_user_filter_02.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/filters/php_user_filter_03.phpt | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 17 |
4 files changed, 10 insertions, 13 deletions
diff --git a/ext/standard/tests/filters/php_user_filter_01.phpt b/ext/standard/tests/filters/php_user_filter_01.phpt index 8632a0113b..ff5a51f5be 100644 --- a/ext/standard/tests/filters/php_user_filter_01.phpt +++ b/ext/standard/tests/filters/php_user_filter_01.phpt @@ -14,4 +14,4 @@ class bar extends php_user_filter { } ?> --EXPECTF-- -Warning: Declaration of bar::filter() should be compatible with php_user_filter::filter($in, $out, &$consumed, $closing) in %s on line %d +Warning: Declaration of bar::filter($in, $out, &$consumed) should be compatible with php_user_filter::filter($in, $out, &$consumed, $closing) in %s on line %d diff --git a/ext/standard/tests/filters/php_user_filter_02.phpt b/ext/standard/tests/filters/php_user_filter_02.phpt index 46f7c6b1cd..bdd73c01a8 100644 --- a/ext/standard/tests/filters/php_user_filter_02.phpt +++ b/ext/standard/tests/filters/php_user_filter_02.phpt @@ -9,4 +9,4 @@ class foo extends php_user_filter { } ?> --EXPECTF-- -Warning: Declaration of foo::filter() should be compatible with php_user_filter::filter($in, $out, &$consumed, $closing) in %s on line %d +Warning: Declaration of foo::filter($in, $out, $consumed, $closing) should be compatible with php_user_filter::filter($in, $out, &$consumed, $closing) in %s on line %d diff --git a/ext/standard/tests/filters/php_user_filter_03.phpt b/ext/standard/tests/filters/php_user_filter_03.phpt index a214131b29..867b74eb89 100644 --- a/ext/standard/tests/filters/php_user_filter_03.phpt +++ b/ext/standard/tests/filters/php_user_filter_03.phpt @@ -9,4 +9,4 @@ class foo extends php_user_filter { } ?> --EXPECTF-- -Warning: Declaration of foo::onCreate() should be compatible with php_user_filter::onCreate() in %s on line %d +Warning: Declaration of foo::onCreate($var) should be compatible with php_user_filter::onCreate() in %s on line %d diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 73b9d774a7..cc04f34cab 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1470,11 +1470,6 @@ static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals) */ 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); -#endif REGISTER_INI_ENTRIES(); return SUCCESS; } @@ -1726,10 +1721,6 @@ int main(int argc, char *argv[]) size_t ini_entries_len = 0; /* end of temporary locals */ -#ifdef ZTS - void ***tsrm_ls; -#endif - int max_requests = 500; int requests = 0; int fastcgi; @@ -1774,10 +1765,16 @@ int main(int argc, char *argv[]) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); - tsrm_ls = ts_resource(0); + (void)ts_resource(0); ZEND_TSRMLS_CACHE_UPDATE(); #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); +#endif + sapi_startup(&cgi_sapi_module); fastcgi = fcgi_is_fastcgi(); cgi_sapi_module.php_ini_path_override = NULL; |