From: Xinchen Hui <laruence@php.net>
Date: Sun, 1 Jun 2014 11:42:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_PHPNG_MERGE~234^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d196ac6a48448d654f478192970e07c6bae3e051;p=php

Merge branch 'PHP-5.6'
---

d196ac6a48448d654f478192970e07c6bae3e051
diff --cc ext/spl/spl_directory.c
index edb4c071cf,4159d1ae34..0d5cccf0c9
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@@ -836,8 -837,9 +837,9 @@@ SPL_METHOD(DirectoryIterator, seek
  		int valid = 0;
  		zend_call_method_with_0_params(&this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_valid, "valid", &retval);
  		if (retval) {
 -			valid = zend_is_true(retval);
 +			valid = zend_is_true(retval TSRMLS_CC);
  			zval_ptr_dtor(&retval);
+ 			retval = NULL;
  		}
  		if (!valid) {
  			break;