Paul Garvin [Wed, 7 May 2014 04:17:45 +0000 (00:17 -0400)]
SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME
Currently when you use RecursiveDirectoryIterator with the
CURRENT_AS_PATHNAME flag PHP will throw an UnexpectedValueException with
message 'Objects returned by RecursiveIterator::getChildren() must implement
RecursiveIterator'.This happend because getChildren() will return the
current directory name instead of an Iterator (or subclass of) as required
by the RecursiveIterator interface.
This commit changes getChildren() to return annother
RecursiveDirectoryIterator but current() still returns the path name when
CURRENT_AS_PATHNAME is used. A PHPT test case (bug66405.phpt) that
reproduces the bug is included.
This fix was originally against the PHP-5.4 branch, but it was not merged
before 5.4 reached EOL. I am hoping to get it applied to 5.5, 5.6, and
master.
Anatol Belski [Fri, 28 Nov 2014 11:24:32 +0000 (12:24 +0100)]
disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows
This is using the openssl binary which, despite it's contained in the
deps, would probably miss all it's environment. It is just prone to
failure and thus is not worth it.
Anatol Belski [Fri, 28 Nov 2014 09:17:22 +0000 (10:17 +0100)]
Fixed bug #68225 unpack and X format code
This is done by reverting some parts to the state of pre 7, whereby
that means all the size_t potential isn't exhausted. This might be
a subject of the subsequent fix, the functionality can be ensured
with the supplied test.
Dmitry Stogov [Fri, 28 Nov 2014 07:21:18 +0000 (10:21 +0300)]
Get rid of EX(scope). In most cases we use EG(scope) anyway. EX(scope) was used to switch EG(scope) back after call, but it's possibleto use EX(func)->common.scope instead.
Julien Pauli [Thu, 27 Nov 2014 10:22:23 +0000 (11:22 +0100)]
Merge branch 'pull-request/826'
* pull-request/826:
New label length test
Fix ext/filter/tests/033.phpt
Fix filter_list test
FILTER_VALIDATE_DOMAIN and RFC conformance for FILTER_VALIDATE_URL
Ferenc Kovacs [Wed, 26 Nov 2014 23:13:33 +0000 (00:13 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
5.5.21 now
Ferenc Kovacs [Wed, 26 Nov 2014 23:13:11 +0000 (00:13 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
5.5.21 now
Ferenc Kovacs [Wed, 26 Nov 2014 23:08:40 +0000 (00:08 +0100)]
the darwin specific test fails for me with the same output which is the expected for the original test
I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on
qa.php.net/reports and on google which do see this test failing on mac.
if this change causes you to have this test failing on Mac, please drop me a mail so we can improve
the current test so it passes for everybody.
Dmitry Stogov [Wed, 26 Nov 2014 19:44:58 +0000 (22:44 +0300)]
Reimplemented silence operator (@) handling on exceptions. Now each silence region is stored in op_array->brk_cont_array. On exception ZEND_HANDLE_EXCEPTION handler traverse this array and restore original EG(error_reporting) if exception occured inside a "silence" region.
projects / php / log