summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-10-15 09:46:35 +0200
committerAnatol Belski <ab@php.net>2014-10-15 09:46:35 +0200
commit1fc8220b6516ac6f40d81eb7cee1eefe69c7e4a0 (patch)
treec0e8e4590dc0e984b770e21dfc24043d04f2d225 /sapi/apache2handler
parentc00424e427930a33e6d8645cc3f23fb78ed29b9f (diff)
downloadphp-git-1fc8220b6516ac6f40d81eb7cee1eefe69c7e4a0.tar.gz
TSRMLS_FETCH() is a spent force
Diffstat (limited to 'sapi/apache2handler')
-rw-r--r--sapi/apache2handler/sapi_apache2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index fe200304fd..6b0ab4876d 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);