Merge branch 'PHP-5.6'

diff --cc ext/spl/spl_directory.c
index edb4c071cfdc36a11ed4bd78eb72fe85ea8a9173,4159d1ae3442cb64bd7ff45eca3c20479f348ca5..0d5cccf0c961da557a7be588a8983a5ae5bf56b9
--- 1/ext/spl/spl_directory.c
--- 2/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;

diff --cc ext/spl/spl_iterators.c
Simple merge