summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-02-24 14:07:06 +0100
committerNikita Popov <nikic@php.net>2016-02-24 14:09:03 +0100
commitd1057cc13971e90ea3e7720dc5c82bbc92c4ad23 (patch)
tree17db12a79915b1282eaa94055107f4a0ac19a8a1 /Zend/zend_execute_API.c
parentbb2856b28c8dcc9ea5ba8dcdacb3c84b63ff945e (diff)
downloadphp-git-d1057cc13971e90ea3e7720dc5c82bbc92c4ad23.tar.gz
Fixed bug #71470
Don't report hashtable iterator leaks on unclean shutdown, those are expected.
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 0c6f0377da..56ad4366ff 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -398,7 +398,7 @@ void shutdown_executor(void) /* {{{ */
zend_shutdown_fpu();
#ifdef ZEND_DEBUG
- if (EG(ht_iterators_used)) {
+ if (EG(ht_iterators_used) && !CG(unclean_shutdown)) {
zend_error(E_WARNING, "Leaked %" PRIu32 " hashtable iterators", EG(ht_iterators_used));
}
#endif