com php-src: Merge branch 'PHP-5.6': ext/spl/spl_directory. c ext/spl/spl_iterators.c

From: Date: Sun, 01 Jun 2014 11:42:53 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/spl/spl_directory. c ext/spl/spl_iterators.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78653@lists.php.net to get a copy of this message
Commit: d196ac6a48448d654f478192970e07c6bae3e051 Author: Xinchen Hui <laruence@php.net> Sun, 1 Jun 2014 19:42:53 +0800 Parents: f4a235c541c5d94c88217e1b6707943b7e30cb5a f41ab36e5cd6a2e41ca13d1bd8ee922c42e5bb27 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d196ac6a48448d654f478192970e07c6bae3e051 Log: Merge branch 'PHP-5.6' Changed paths: MM ext/spl/spl_directory.c MM ext/spl/spl_iterators.c Diff: diff --cc ext/spl/spl_directory.c index edb4c07,4159d1a..0d5cccf --- 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;

« previous php.cvs (#78653) next »