From: Xinchen Hui <laruence@php.net>
Date: Tue, 7 Jul 2015 13:28:51 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta1~12^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fff374febad70e6c8fe74930d5ea417d2d3b55b9;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/spl/spl_iterators.c
---

fff374febad70e6c8fe74930d5ea417d2d3b55b9
diff --cc ext/spl/spl_iterators.c
index 504065e7fd,359d94d6ed..e8fe2ce101
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@@ -390,9 -380,11 +390,11 @@@ next_step
  					}
  				}
  			}
- 			zend_iterator_dtor(iterator);
- 			zval_ptr_dtor(&object->iterators[object->level].zobject);
- 			object->level--;
+ 			if (object->level > 0) {
 -				iterator->funcs->dtor(iterator TSRMLS_CC);
++				zend_iterator_dtor(iterator);
+ 				zval_ptr_dtor(&object->iterators[object->level].zobject);
+ 				object->level--;
+ 			}
  		} else {
  			return; /* done completeley */
  		}