diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-09-20 20:22:14 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-09-20 20:22:14 +0100 |
| commit | b3aebda9eaf55706af2e21178f229a171725a168 (patch) | |
| tree | 9aa1794dc4b513d5c0077adcbeb89fa215f181a4 /sapi/cgi/cgi_main.c | |
| parent | 763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff) | |
| download | php-git-b3aebda9eaf55706af2e21178f229a171725a168.tar.gz | |
native tls initial patch
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index dead1c3213..4c7ffceab0 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -197,7 +197,7 @@ static void user_config_cache_entry_dtor(zval *el) /* }}} */ #ifdef ZTS -static int php_cgi_globals_id; +TSRMG_D(php_cgi_globals_struct, php_cgi_globals_id); #define CGIG(v) TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v) #else static php_cgi_globals_struct php_cgi_globals; @@ -1486,7 +1486,7 @@ 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); + TSRMG_ALLOCATE(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 @@ -1719,7 +1719,7 @@ static zend_module_entry cgi_module_entry = { NULL, PHP_MINFO(cgi), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + STANDARD_MODULE_PROPERTIES_EX }; /* {{{ main @@ -1741,10 +1741,6 @@ int main(int argc, char *argv[]) int ini_entries_len = 0; /* end of temporary locals */ -#ifdef ZTS - void ***tsrm_ls; -#endif - int max_requests = 500; int requests = 0; int fastcgi; @@ -1789,7 +1785,7 @@ int main(int argc, char *argv[]) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); - tsrm_ls = ts_resource(0); + TSRMLS_INIT(); #endif sapi_startup(&cgi_sapi_module); |