summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| |\
| | * Updated NEWS for #66091Tjerk Meesters2014-08-131-0/+3
| | * Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-08-132-20/+36
| | |\
| | | * Fixed #66091Tjerk Meesters2014-08-133-15/+24
| * | | Merge branch 'pr-765' into PHP-5.6Ferenc Kovacs2014-08-122-0/+31
| |\ \ \
| | * | | NEWS entry for e6d93a1 / d73d44cDavid Zuelke2014-08-091-0/+3
| | * | | restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b...David Zuelke2014-08-091-3/+8
| | * | | Revert "Merge branch 'pull-request/694' into PHP-5.6"David Zuelke2014-08-091-1/+24
| * | | | updated NEWSAnatol Belski2014-08-121-0/+4
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-121-3/+30
| |\ \ \ \
| | * | | | updated NEWSAnatol Belski2014-08-121-0/+2
| | | |/ / | | |/| |
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-121-3/+30
| | |\ \ \ | | | | |/ | | | |/|
| | | * | 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
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-08-123-10/+10
| | |\ \ \ | | | |/ /
| | | * | fix the failing date tests introduced with the latest timezonedb updateFerenc Kovacs2014-08-123-10/+10
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2014-08-116-6/+10
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong...Xinchen Hui2014-08-113-2/+6
| | * | 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
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-071-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-071-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | fix TS buildAnatol Belski2014-08-071-1/+1
| * | | | | | | Update NEWSDaniel Lowrey2014-08-071-0/+4
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2014-08-070-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Update NEWSDaniel Lowrey2014-08-071-0/+3
| | * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-08-070-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Update NEWSDaniel Lowrey2014-08-071-0/+4
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Daniel Lowrey2014-08-071-0/+46
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Daniel Lowrey2014-08-071-0/+46
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug #41631: Observe socket read timeouts in SSL streamsDaniel Lowrey2014-08-071-0/+46
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-071-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-071-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | wrap int8_t and int16_t with #ifdef to avoid possible clashesAnatol Belski2014-08-071-0/+4
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Derick Rethans2014-08-071-1315/+1389
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Derick Rethans2014-08-071-1315/+1389
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | - Updated to version 2014.6 (2014f)Derick Rethans2014-08-071-1315/+1389
| * | | | | | | Removed Countable::count() change info from UPGRADE.INTERNALS tooBob Weinand2014-08-061-12/+4
| * | | | | | | Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context opt...Ferenc Kovacs2014-08-066-76/+9
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-08-060-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Andrey Hristov2014-08-063-4/+19
| | |\ \ \ \ \ \