diff options
| author | Anatol Belski <ab@php.net> | 2014-10-15 18:23:41 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-15 18:23:41 +0200 |
| commit | 2bddd58d32b0eac53d98132f28de24c8688a1a54 (patch) | |
| tree | e4012d81ac3409d31e664ccae392cf5e2ed070cc | |
| parent | aff66a94a631b5711549395bb282f61b6f6f9e49 (diff) | |
| download | php-git-2bddd58d32b0eac53d98132f28de24c8688a1a54.tar.gz | |
move SG to use global tsrmls pointer
| -rw-r--r-- | main/SAPI.c | 3 | ||||
| -rw-r--r-- | main/SAPI.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 50ea8c0a16..e75016f67f 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -64,6 +64,9 @@ static void _type_dtor(zval *zv) static void sapi_globals_ctor(sapi_globals_struct *sapi_globals TSRMLS_DC) { +#ifdef ZTS + ZEND_TSRMLS_CACHE_UPDATE; +#endif memset(sapi_globals, 0, sizeof(*sapi_globals)); zend_hash_init_ex(&sapi_globals->known_post_content_types, 8, NULL, _type_dtor, 1, 0); php_setup_sapi_content_types(TSRMLS_C); diff --git a/main/SAPI.h b/main/SAPI.h index 79661371d9..c4eb86dea8 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -142,7 +142,7 @@ typedef struct _sapi_globals_struct { BEGIN_EXTERN_C() #ifdef ZTS -# define SG(v) TSRMG(sapi_globals_id, sapi_globals_struct *, v) +# define SG(v) ZEND_TSRMG(sapi_globals_id, sapi_globals_struct *, v) SAPI_API extern int sapi_globals_id; #else # define SG(v) (sapi_globals.v) |