summaryrefslogtreecommitdiff
path: root/ext/standard/basic_functions.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-08-20 22:39:14 +0200
committerAnatol Belski <ab@php.net>2016-08-20 22:41:06 +0200
commit872028de20b91e25428205f49fc036a09d4b001d (patch)
tree147f759d72e23b9e5447f6270f28fc56f3d71710 /ext/standard/basic_functions.c
parentdfed09afcaed6773f00b366b0580a187f2fc453f (diff)
downloadphp-git-872028de20b91e25428205f49fc036a09d4b001d.tar.gz
fix TS issues with url rewrite globals
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r--ext/standard/basic_functions.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index ef628cc6cb..5463665a09 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3484,6 +3484,12 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p) /* {{{ */
memset(&BG(url_adapt_session_ex), 0, sizeof(BG(url_adapt_session_ex)));
memset(&BG(url_adapt_output_ex), 0, sizeof(BG(url_adapt_output_ex)));
+ BG(url_adapt_session_ex).type = 1;
+ BG(url_adapt_output_ex).type = 0;
+
+ zend_hash_init(&BG(url_adapt_session_hosts_ht), 0, NULL, NULL, 1);
+ zend_hash_init(&BG(url_adapt_output_hosts_ht), 0, NULL, NULL, 1);
+
#if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
memset(&BG(mblen_state), 0, sizeof(BG(mblen_state)));
#endif
@@ -3504,6 +3510,9 @@ static void basic_globals_dtor(php_basic_globals *basic_globals_p) /* {{{ */
zend_hash_destroy(basic_globals_p->url_adapt_output_ex.tags);
free(basic_globals_p->url_adapt_output_ex.tags);
}
+
+ zend_hash_destroy(&basic_globals_p->url_adapt_session_hosts_ht);
+ zend_hash_destroy(&basic_globals_p->url_adapt_output_hosts_ht);
}
/* }}} */