From: Pierrick Charron <pierrick@php.net>
Date: Wed, 27 Jul 2016 00:36:34 +0000 (-0400)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.10RC1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2597f5d66552051994ed55655107d9c5142f7d34;p=php

Merge branch 'PHP-5.6' into PHP-7.0

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

2597f5d66552051994ed55655107d9c5142f7d34
diff --cc ext/spl/spl_iterators.c
index 6a0049733f,a023b11829..0977228faa
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@@ -1675,12 -1684,12 +1675,12 @@@ static inline void spl_dual_it_free(spl
  	}
  }
  
 -static inline void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
 +static inline void spl_dual_it_rewind(spl_dual_it_object *intern)
  {
 -	spl_dual_it_free(intern TSRMLS_CC);
 +	spl_dual_it_free(intern);
  	intern->current.pos = 0;
- 	if (intern->inner.iterator->funcs->rewind) {
+ 	if (intern->inner.iterator && intern->inner.iterator->funcs->rewind) {
 -		intern->inner.iterator->funcs->rewind(intern->inner.iterator TSRMLS_CC);
 +		intern->inner.iterator->funcs->rewind(intern->inner.iterator);
  	}
  }