summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* removing the NEWS entry for #41631 as we reverted the fix for nowphp-5.6.0PHP-5.6.0Ferenc Kovacs2014-08-271-2/+0
|
* Revert "Merge branch 'PHP-5.5' into PHP-5.6"Ferenc Kovacs2014-08-271-46/+0
| | | | | This reverts commit 98e67add15a6b889efe152c23ed15a61f022a63a, reversing changes made to 2cdc1a2b7473eff27c224c66dcb85118b553a147.
* Revert "fix TS build"Ferenc Kovacs2014-08-271-1/+1
| | | | This reverts commit 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf.
* reworked NEWS for 5.6.0GAFerenc Kovacs2014-08-271-541/+351
|
* update the GIT-RULES with the 5.6 and the release branchesFerenc Kovacs2014-08-271-0/+6
|
* better heading for UPGRADING.INTERNALSFerenc Kovacs2014-08-271-1/+1
|
* remove the -dev suffix from the Zend versionFerenc Kovacs2014-08-271-1/+1
|
* Some changes were lost in the merge commit of #66091Tjerk Meesters2014-08-271-0/+6
|
* bump versions to stableFerenc Kovacs2014-08-272-3/+3
|
* add the final NEWS entry for 5.6.0Ferenc Kovacs2014-08-271-2/+9255
|
* Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597Remi Collet2014-08-271-24/+60
| | | | | | | | Incomplete fix for CVE-2014-4049 Check possible buffer overflow - pass real buffer end to dn_expand calls - check buffer len before each read
* fix potentially missing NUL terminationStanislav Malyshev2014-08-271-0/+2
|
* improve the grammar for my recent UPGRADING noteFerenc Kovacs2014-08-271-1/+1
|
* mention the changes regarding ReflectionClass::newInstanceWithoutConstructor ↵Ferenc Kovacs2014-08-271-0/+7
| | | | | | | in UPGRADING see the discussion on the mailing list and in the pull request for details: https://github.com/php/php-src/pull/733
* Fix bug #67716 - Segfault in cdf.cRemi Collet2014-08-271-1/+1
|
* Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>Lior Kaplan2014-08-277-0/+252
|
* Fix bug #67730 - Null byte injection possible with imagexxx functionsStanislav Malyshev2014-08-271-0/+5
|
* Revert "Fixed Bug #67724"Ferenc Kovacs2014-08-273-28/+1
| | | | This reverts commit e4ff7f2ee346d641715694209e61704c9e815483.
* Fixed #67694: Regression in session_regenerate_id()Tjerk Meesters2014-08-272-1/+42
|
* bump to RC4php-5.6.0RC4Ferenc Kovacs2014-08-142-3/+3
|
* Merge branch 'PHP-5.6' into PHP-5.6.0Ferenc Kovacs2014-08-1448-13032/+13574
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (60 commits) new NEWS block for the next release Updated NEWS for #66091 Updated NEWS for #66091 Fixed #66091 updated NEWS updated NEWS updated NEWS backported the fix for bug #41577 fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) NEWS entry for e6d93a1 / d73d44c restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 Revert "Merge branch 'pull-request/694' into PHP-5.6" Add __debugInfo() to UPGRADING. fix TS build Update NEWS Update NEWS Update NEWS Bug #41631: Observe socket read timeouts in SSL streams wrap int8_t and int16_t with #ifdef to avoid possible clashes ... Conflicts: NEWS
| * new NEWS block for the next releaseFerenc Kovacs2014-08-141-1/+3
| |
| * Updated NEWS for #66091Tjerk Meesters2014-08-131-0/+3
| |
| * Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-08-132-20/+28
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS for #66091 Fixed #66091 Conflicts: ext/date/php_date.c
| | * Updated NEWS for #66091Tjerk Meesters2014-08-131-0/+3
| | |
| | * Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-08-132-20/+36
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed #66091 Conflicts: ext/date/php_date.c
| | | * Fixed #66091Tjerk Meesters2014-08-133-15/+24
| | | |
| * | | Merge branch 'pr-765' into PHP-5.6Ferenc Kovacs2014-08-122-0/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pr-765: NEWS entry for e6d93a1 / d73d44c restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 Revert "Merge branch 'pull-request/694' into PHP-5.6"
| | * | | NEWS entry for e6d93a1 / d73d44cDavid Zuelke2014-08-091-0/+3
| | | | |
| | * | | restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes ↵David Zuelke2014-08-091-3/+8
| | | | | | | | | | | | | | | | | | | | bug 67606
| | * | | Revert "Merge branch 'pull-request/694' into PHP-5.6"David Zuelke2014-08-091-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d96de86b5b4ca8adf63ac6e07ab57fc2ec9d87f4, reversing changes made to b1e32a4f7a6c2351a2006c2c1b9085336ba513e4.
| * | | | updated NEWSAnatol Belski2014-08-121-0/+4
| | | | |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-121-3/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS updated NEWS backported the fix for bug #41577
| | * | | | updated NEWSAnatol Belski2014-08-121-0/+2
| | | |/ / | | |/| |
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-121-3/+30
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | * PHP-5.4: updated NEWS backported the fix for bug #41577
| | | * | updated NEWSAnatol Belski2014-08-121-0/+2
| | | | |
| | | * | backported the fix for bug #41577Anatol Belski2014-08-121-3/+30
| | | | |
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-08-123-10/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.5: fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-08-123-10/+10
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * PHP-5.4: fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
| | | * | fix the failing date tests introduced with the latest timezonedb updateFerenc Kovacs2014-08-123-10/+10
| | | | | | | | | | | | | | | | | | | | Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-08-116-6/+10
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException ↵Xinchen Hui2014-08-113-2/+6
| | | | | | | | | | | | | | | | wrong message)
| | * | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-08-1150-12973/+13731
| | |\ \
| | * \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-07-186-7/+80
| | |\ \ \
| | * \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-07-184-3/+32
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-07-1718-1202/+2980
| | |\ \ \ \ \
| | * | | | | | Fixed tests affect by local iniXinchen Hui2014-07-094-4/+8
| | | | | | | |
| * | | | | | | Add __debugInfo() to UPGRADING.Adam Harvey2014-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RMs: this is an UPGRADING only change, and should be safe for RCs. Developers: please remember to update UPGRADING, otherwise there's a good chance your shiny new feature won't be documented! (As has happened here.)
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-071-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix TS build
| | * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-071-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix TS build