summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TSRM/TSRM.c4
-rw-r--r--Zend/zend.c3
-rw-r--r--Zend/zend_alloc.c1
-rw-r--r--Zend/zend_signal.c1
-rw-r--r--main/SAPI.c3
-rw-r--r--main/output.c1
-rw-r--r--sapi/apache2handler/sapi_apache2.c4
-rw-r--r--sapi/cgi/cgi_main.c4
-rw-r--r--sapi/cli/php_cli.c2
-rw-r--r--sapi/cli/php_cli_server.c3
-rw-r--r--sapi/embed/php_embed.c2
-rw-r--r--sapi/phpdbg/phpdbg.c2
12 files changed, 15 insertions, 15 deletions
diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index 63ae6efc23..67f6722945 100644
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -19,9 +19,8 @@
typedef struct _tsrm_tls_entry tsrm_tls_entry;
-#if defined(TSRM_WIN32)
/* TSRMLS_CACHE_DEFINE; is already done in Zend, this is being always compiled statically. */
-#endif
+TSRMLS_CACHE_EXTERN();
struct _tsrm_tls_entry {
void **storage;
@@ -300,6 +299,7 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
/* Set thread local storage to this new thread resources structure */
tsrm_tls_set(*thread_resources_ptr);
+ TSRMLS_CACHE = *thread_resources_ptr;
if (tsrm_new_thread_begin_handler) {
tsrm_new_thread_begin_handler(thread_id);
diff --git a/Zend/zend.c b/Zend/zend.c
index 7361efcb0e..542ac9ff1d 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -679,8 +679,6 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals) /* {{
static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{{ */
{
- ZEND_TSRMLS_CACHE_UPDATE();
-
zend_startup_constants();
zend_copy_constants(executor_globals->zend_constants, GLOBAL_CONSTANTS_TABLE);
zend_init_rsrc_plist();
@@ -780,7 +778,6 @@ int zend_startup(zend_utility_functions *utility_functions) /* {{{ */
zend_executor_globals *executor_globals;
extern ZEND_API ts_rsrc_id ini_scanner_globals_id;
extern ZEND_API ts_rsrc_id language_scanner_globals_id;
- ZEND_TSRMLS_CACHE_UPDATE();
#else
extern zend_ini_scanner_globals ini_scanner_globals;
extern zend_php_scanner_globals language_scanner_globals;
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 83eee90312..27879dae03 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2723,7 +2723,6 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
if (tmp && zend_atoi(tmp, 0)) {
zend_mm_use_huge_pages = 1;
}
- ZEND_TSRMLS_CACHE_UPDATE();
alloc_globals->mm_heap = zend_mm_init();
}
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index d5146b6dec..a0dccd5819 100644
--- a/Zend/zend_signal.c
+++ b/Zend/zend_signal.c
@@ -87,7 +87,6 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context)
zend_bool is_handling_safe = 1;
#ifdef ZTS
- ZEND_TSRMLS_CACHE_UPDATE();
/* A signal could hit after TSRM shutdown, in this case globals are already freed. */
if (NULL == TSRMLS_CACHE || NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) {
is_handling_safe = 0;
diff --git a/main/SAPI.c b/main/SAPI.c
index 0d81731f5c..6a272d4c64 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -56,9 +56,6 @@ static void _type_dtor(zval *zv)
static void sapi_globals_ctor(sapi_globals_struct *sapi_globals)
{
-#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();
diff --git a/main/output.c b/main/output.c
index 4b2157943d..7751586dbc 100644
--- a/main/output.c
+++ b/main/output.c
@@ -79,7 +79,6 @@ static int php_output_handler_devnull_func(void **handler_context, php_output_co
* Initialize the module globals on MINIT */
static inline void php_output_init_globals(zend_output_globals *G)
{
- ZEND_TSRMLS_CACHE_UPDATE();
memset(G, 0, sizeof(*G));
}
/* }}} */
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 1aeccb17c9..81198af562 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -476,7 +476,9 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
+# ifdef PHP_WIN32
ZEND_TSRMLS_CACHE_UPDATE();
+# endif
#endif
zend_signal_startup();
@@ -574,7 +576,9 @@ static int php_handler(request_rec *r)
#ifdef ZTS
/* initial resource fetch */
(void)ts_resource(0);
+# ifdef PHP_WIN32
ZEND_TSRMLS_CACHE_UPDATE();
+# endif
#endif
#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req);
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index bc157ec70e..84d2213cd6 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1532,7 +1532,7 @@ PHP_INI_END()
*/
static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals)
{
-#ifdef ZTS
+#if defined(ZTS) && defined(PHP_WIN32)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
php_cgi_globals->rfc2616_headers = 0;
@@ -1793,7 +1793,9 @@ int main(int argc, char *argv[])
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
+# ifdef PHP_WIN32
ZEND_TSRMLS_CACHE_UPDATE();
+# endif
#endif
zend_signal_startup();
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 51e0a03fe8..2cc83a5d6d 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -1248,7 +1248,9 @@ int main(int argc, char *argv[])
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
+# ifdef PHP_WIN32
ZEND_TSRMLS_CACHE_UPDATE();
+# endif
#endif
zend_signal_startup();
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 3588a902a0..544c1e14cc 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1296,9 +1296,6 @@ out:
static int php_cli_server_request_ctor(php_cli_server_request *req) /* {{{ */
{
-#ifdef ZTS
-ZEND_TSRMLS_CACHE_UPDATE();
-#endif
req->protocol_version = 0;
req->request_uri = NULL;
req->request_uri_len = 0;
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index 826e9bd05e..4221e6e0eb 100644
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -173,7 +173,9 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv)
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
+# ifdef PHP_WIN32
ZEND_TSRMLS_CACHE_UPDATE();
+# endif
#endif
zend_signal_startup();
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 4834f8b5cf..11e1fcf574 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1418,7 +1418,9 @@ phpdbg_main:
#ifdef ZTS
tsrm_startup(1, 1, 0, NULL);
(void)ts_resource(0);
+# ifdef PHP_WIN32
ZEND_TSRMLS_CACHE_UPDATE();
+# endif
#endif
zend_signal_startup();
View Lorry Controller Status