com php-src: TSRMLS_FETCH() is a spent force: TSRM/TSRM.h sapi/apache2handler/sapi_apache2.c

Commit: 1fc8220b6516ac6f40d81eb7cee1eefe69c7e4a0 Author: Anatol Belski <ab@php.net> Wed, 15 Oct 2014 09:46:35 +0200 Parents: c00424e427930a33e6d8645cc3f23fb78ed29b9f Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1fc8220b6516ac6f40d81eb7cee1eefe69c7e4a0 Log: TSRMLS_FETCH() is a spent force Changed paths: M TSRM/TSRM.h M sapi/apache2handler/sapi_apache2.c Diff: diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index b303c13..de5908f 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -166,7 +166,6 @@ TSRM_API inline void *tsrm_get_ls_cache(void); #define TSRM_SHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)+1) #define TSRM_UNSHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)-1) -#define TSRMLS_FETCH() void ***tsrm_ls = (void ***) ts_resource_ex(0, NULL) #define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx #define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_get_ls_cache() #define TSRMG(id, type, element) (((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element) @@ -181,6 +180,7 @@ TSRM_API inline void *tsrm_get_ls_cache(void); #define TSRMLS_DC #define TSRMLS_C #define TSRMLS_CC +#define TSRMLS_FETCH() #ifdef __cplusplus } diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index fe20030...6b0ab48 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -540,7 +540,10 @@ static int php_handler(request_rec *r) apr_bucket *bucket; apr_status_t rv; request_rec * volatile parent_req = NULL; - TSRMLS_FETCH(); +#ifdef ZTS + /* initial resource fetch */ + void ***tsrm_ls = ts_resource(0); +#endif #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);