diff options
| author | Derick Rethans <github@derickrethans.nl> | 2012-08-24 10:55:17 +0200 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2012-08-24 10:55:17 +0200 |
| commit | e5bfcd340a8e6aa9e46bef43894c78c06e80a3c8 (patch) | |
| tree | 7e11e961bd43b1eb3af7149ce8af8b03d7f4ac2c /ext/standard/basic_functions.c | |
| parent | 0a2833bbefd803a63014429973b14839718975e2 (diff) | |
| parent | 13bcf685cb0a92e502ebe39f4b22c64304a9f333 (diff) | |
| download | php-git-e5bfcd340a8e6aa9e46bef43894c78c06e80a3c8.tar.gz | |
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 99831a1f42..4858b6e375 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5108,8 +5108,11 @@ void php_free_shutdown_functions(TSRMLS_D) /* {{{ */ zend_hash_destroy(BG(user_shutdown_function_names)); FREE_HASHTABLE(BG(user_shutdown_function_names)); BG(user_shutdown_function_names) = NULL; - } - zend_end_try(); + } zend_catch { + /* maybe shutdown method call exit, we just ignore it */ + FREE_HASHTABLE(BG(user_shutdown_function_names)); + BG(user_shutdown_function_names) = NULL; + } zend_end_try(); } /* }}} */ |