summaryrefslogtreecommitdiff
path: root/ext/xml/xml.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-10-17 14:31:17 +0200
committerAnatol Belski <ab@php.net>2014-10-17 14:31:17 +0200
commit5749b4a9979cd3ff85996323bed9adc1bd182f76 (patch)
treeaa14675bcd4d43bd6c7d7ba2dff595cb970b54b0 /ext/xml/xml.c
parentfea10f6a5e5ff4d22adea5fd04476a88d4f76db8 (diff)
downloadphp-git-5749b4a9979cd3ff85996323bed9adc1bd182f76.tar.gz
ext/libxml, ext/xml and ext/soap use static tsrmls pointer
Diffstat (limited to 'ext/xml/xml.c')
-rw-r--r--ext/xml/xml.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index f1a3442b6d..6959424376 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -62,6 +62,9 @@ ZEND_DECLARE_MODULE_GLOBALS(xml)
/* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_XML
+#ifdef ZTS
+ZEND_TSRMLS_CACHE_DEFINE;
+#endif
ZEND_GET_MODULE(xml)
#endif /* COMPILE_DL_XML */
/* }}} */
@@ -290,6 +293,9 @@ static int le_xml_parser;
/* {{{ startup, shutdown and info functions */
static PHP_GINIT_FUNCTION(xml)
{
+#if defined(COMPILE_DL_XML) && defined(ZTS)
+ ZEND_TSRMLS_CACHE_UPDATE;
+#endif
xml_globals->default_encoding = (XML_Char*)"UTF-8";
}