From fea10f6a5e5ff4d22adea5fd04476a88d4f76db8 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Fri, 17 Oct 2014 14:16:40 +0200
Subject: ext/iconv, ext/json and ext/session use static tsrmls pointer

---
 ext/json/json.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ext/json/json.c')

diff --git a/ext/json/json.c b/ext/json/json.c
index 8f4f281ef1..91bedcace9 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -125,6 +125,9 @@ static PHP_MINIT_FUNCTION(json)
 */
 static PHP_GINIT_FUNCTION(json)
 {
+#if defined(COMPILE_DL_JSON) && defined(ZTS)
+	ZEND_TSRMLS_CACHE_UPDATE;
+#endif
 	json_globals->encoder_depth = 0;
 	json_globals->error_code = 0;
 	json_globals->encode_max_depth = 0;
@@ -153,6 +156,9 @@ zend_module_entry json_module_entry = {
 /* }}} */
 
 #ifdef COMPILE_DL_JSON
+#ifdef ZTS
+ZEND_TSRMLS_CACHE_DEFINE;
+#endif
 ZEND_GET_MODULE(json)
 #endif
 
-- 
cgit v1.2.1