diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2016-08-11 04:14:01 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2016-08-11 04:14:01 +0200 |
| commit | 0baab6c051eef33573cd6dd798b747637d1ff127 (patch) | |
| tree | 5401d58156a81fc2a738ca07a443eeccf6eca7bc /ext/standard/basic_functions.c | |
| parent | ff1a3cecae250bdde8955597dc94594161938cdf (diff) | |
| parent | 052e69e50a597a330547cf5b40316a61d7bd530d (diff) | |
| download | php-git-0baab6c051eef33573cd6dd798b747637d1ff127.tar.gz | |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 88e628ae05..ef628cc6cb 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3481,7 +3481,8 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p) /* {{{ */ memset(&BG(serialize), 0, sizeof(BG(serialize))); memset(&BG(unserialize), 0, sizeof(BG(unserialize))); - memset(&BG(url_adapt_state_ex), 0, sizeof(BG(url_adapt_state_ex))); + 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))); #if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T) memset(&BG(mblen_state), 0, sizeof(BG(mblen_state))); @@ -3495,9 +3496,13 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p) /* {{{ */ static void basic_globals_dtor(php_basic_globals *basic_globals_p) /* {{{ */ { - if (basic_globals_p->url_adapt_state_ex.tags) { - zend_hash_destroy(basic_globals_p->url_adapt_state_ex.tags); - free(basic_globals_p->url_adapt_state_ex.tags); + if (basic_globals_p->url_adapt_session_ex.tags) { + zend_hash_destroy(basic_globals_p->url_adapt_session_ex.tags); + free(basic_globals_p->url_adapt_session_ex.tags); + } + if (basic_globals_p->url_adapt_output_ex.tags) { + zend_hash_destroy(basic_globals_p->url_adapt_output_ex.tags); + free(basic_globals_p->url_adapt_output_ex.tags); } } /* }}} */ |