summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6php-5.6.4PHP-5.6.4Stanislav Malyshev2014-12-173-32/+62
| | | | | | | | | | | * PHP-5.5: update news add CVE add missing test file Fix bug #68594 - Use after free vulnerability in unserialize() Conflicts: ext/standard/var_unserializer.c
* fix NEWSFerenc Kovacs2014-12-171-4/+6
|
* update the date of the releaseFerenc Kovacs2014-12-161-1/+1
|
* move the test to the right placeAnatol Belski2014-12-101-0/+0
|
* 5.6.4Julien Pauli2014-12-103-3/+11
|
* Fixed bug #68545 NULL pointer dereference in unserialize.cAnatol Belski2014-12-103-33/+56
| | | | | Conflicts: ext/standard/var_unserializer.c
* Fixed possible read after end of buffer and use after free.Dmitry Stogov2014-12-101-2/+6
|
* Fixed day_of_week function as it could sometimes return negative values ↵Derick Rethans2014-12-106-13/+26
| | | | internally.
* Merge branch 'PHP-5.6' into PHP-5.6.4php-5.6.4RC1Ferenc Kovacs2014-11-272-28/+0
|\ | | | | | | | | | | * 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
| * Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-11-272-28/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Conflicts: configure.in main/php_version.h
| | * the darwin specific test fails for me with the same output which is the ↵Ferenc Kovacs2014-11-272-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 nowJulien Pauli2014-11-263-5/+10
| | |
* | | update NEWSFerenc Kovacs2014-11-261-0/+2
| | |
* | | Merge branch 'PHP-5.6' into PHP-5.6.4Ferenc Kovacs2014-11-261-2/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: #68446 is fixed
| * | #68446 is fixedFerenc Kovacs2014-11-262-2/+2
| | |
* | | 5.6.4RC1Ferenc Kovacs2014-11-263-8/+6
|/ /
* | remove the NEWS entries for the reverted stuffFerenc Kovacs2014-11-261-4/+0
| |
* | typo fixFerenc Kovacs2014-11-261-1/+1
| |
* | go back with phpdbg to the state of 5.6.3, reverting the controversial ↵Ferenc Kovacs2014-11-2655-8124/+2673
| | | | | | | | commits(remote debugging/xml protocol)
* | PHP-5.6.5 is nextFerenc Kovacs2014-11-263-5/+7
| |
* | updated lib versionsAnatol Belski2014-11-261-1/+1
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-11-261-2/+2
|\ \ | |/ | | | | | | * PHP-5.5: updated lib versions
| * updated lib versionsAnatol Belski2014-11-261-2/+2
| |
* | fix dir separator in testAnatol Belski2014-11-251-1/+1
| |
* | fix TS buildAnatol Belski2014-11-251-4/+4
| |
* | Better fix for bug #68446Dmitry Stogov2014-11-254-17/+41
| |
* | Revert NEWS and set test to XFAILBob Weinand2014-11-252-1/+2
| |
* | Revert "Fix bug #68446 (bug with constant defaults and type hints)"Bob Weinand2014-11-255-80/+47
| | | | | | | | This reverts commit 5ef138b0c7c4e9532e205f45c18a72aa1d279c24.
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-243-0/+0
|\ \ | |/ | | | | | | * PHP-5.5: move tests into proper place
| * move tests into proper placeStanislav Malyshev2014-11-243-0/+0
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-11-243-4/+24
|\ \ | |/ | | | | | | | | | | * PHP-5.5: fix dir separator in test fork test for windows update for LiteSpeed
| * fix dir separator in testAnatol Belski2014-11-241-3/+3
| |
| * fork test for windowsAnatol Belski2014-11-242-1/+21
| |
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-11-230-0/+0
| |\ | | | | | | | | | | | | * PHP-5.4: update for LiteSpeed
| | * update for LiteSpeedStanislav Malyshev2014-11-231-0/+3
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-231-0/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: update for LiteSpeed
| * | update for LiteSpeedStanislav Malyshev2014-11-231-0/+3
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-237-0/+205
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.5: tests image gd xmlwriter_full_end_element tests Tests for writeAttributeNS and xmlwriter_write_attribute_ns
| * | Merge branch 'pull-request/757' into PHP-5.5Stanislav Malyshev2014-11-234-0/+148
| |\ \ | | | | | | | | | | | | | | | | | | | | * pull-request/757: xmlwriter_full_end_element tests Tests for writeAttributeNS and xmlwriter_write_attribute_ns
| | * | xmlwriter_full_end_element testsMauricio Vieira2014-08-022-0/+77
| | | |
| | * | Tests for writeAttributeNS and xmlwriter_write_attribute_nsMauricio Vieira2014-08-022-0/+71
| | | |
| * | | Merge branch 'pull-request/782' into PHP-5.5Stanislav Malyshev2014-11-233-0/+57
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * pull-request/782: tests image gd
| | * | | tests image gdMarcelo Diniz2014-08-233-0/+57
| | | | |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-2336-0/+1315
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Add my information to this test Add a test for the exception cases of readline_read_history added some tests to datetime and dateinterval functions added various tests for XSLTProcessor and one test for iconv extension teste basico da funcao timezone_version_get
| * | | | Merge branch 'pull-request/854' into PHP-5.5Stanislav Malyshev2014-11-231-0/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/854: teste basico da funcao timezone_version_get
| | * | | | teste basico da funcao timezone_version_getRodrigo Wanderley de Melo Cardoso2014-09-281-0/+12
| | | | | |
| * | | | | Merge branch 'pull-request/855' into PHP-5.5Stanislav Malyshev2014-11-2334-0/+1289
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/855: added some tests to datetime and dateinterval functions added various tests for XSLTProcessor and one test for iconv extension
| | * | | | | added some tests to datetime and dateinterval functionsRodrigo Prado de Jesus2014-09-2812-0/+237
| | | | | | |
| | * | | | | added various tests for XSLTProcessor and one test for iconv extensionRodrigo Prado de Jesus2014-09-2822-0/+1052
| | |/ / / /
| * | | | | Merge branch 'pull-request/856' into PHP-5.5Stanislav Malyshev2014-11-231-0/+14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/856: Add my information to this test Add a test for the exception cases of readline_read_history