diff options
| author | Derick Rethans <github@derickrethans.nl> | 2012-08-24 10:56:03 +0200 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2012-08-24 10:56:03 +0200 |
| commit | bc602495d7e15f3684aaff22b96e9dfb1122b424 (patch) | |
| tree | a994c9f36fdb744dbd55058b41c827f7b1aaa04a /ext/standard/basic_functions.c | |
| parent | de59314a60e6503550546f38fc6ebb141d2fbfdb (diff) | |
| parent | 21f085720cbb8967d6f7826a18e2ce71b6f0e216 (diff) | |
| download | php-git-bc602495d7e15f3684aaff22b96e9dfb1122b424.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
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 e6de34e5fd..72f1dc3c76 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5043,8 +5043,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(); } /* }}} */ |