summaryrefslogtreecommitdiff
path: root/ext
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-08-1511-20/+187
|\
| * Fix another failing testKeyur Govande2014-08-151-1/+9
| * Merge branch 'PHP-5.4' into PHP-5.5Keyur Govande2014-08-1510-18/+158
| |\
| | * Merge branch 'pull-request/772' into PHP-5.4Keyur Govande2014-08-1510-18/+158
| | |\
| | | * Fix failing testsKeyur Govande2014-08-147-14/+29
| | | * Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)Keyur Govande2014-08-143-4/+129
| | * | Fix bug #67716 - Segfault in cdf.cRemi Collet2014-08-141-1/+1
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-141-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-141-1/+1
| |\ \ \
| | * | | Fix bug #67716 - Segfault in cdf.cRemi Collet2014-08-141-1/+1
| | |/ /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-141-1/+2
| |\ \ \ | | |/ /
| | * | fix testStanislav Malyshev2014-08-141-1/+2
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-144-39/+99
| |\ \ \ | | |/ /
| | * | split the glob() test to test different basedirAnatol Belski2014-08-144-39/+99
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-142-4/+60
| |\ \ \ | | |/ /
| | * | fixed glob() edge case on windows, ref bug #47358Anatol Belski2014-08-142-0/+57
| | * | - fix bug #47358, glob returns error, should be empty array()Pierre Joye2014-08-142-4/+3
| | |/
| * | Some changes were lost in the merge commit of #66091Tjerk Meesters2014-08-131-4/+14
| * | Fixed #66091Tjerk Meesters2014-08-132-16/+22
* | | Merge branch 'PHP-5.5' into PHP-5.6Tjerk Meesters2014-08-132-20/+28
|\ \ \
| * \ \ Merge branch 'PHP-5.4' into PHP-5.5Tjerk Meesters2014-08-132-20/+36
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fixed #66091Tjerk Meesters2014-08-132-15/+21
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-121-3/+30
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-121-3/+30
| |\ \ | | |/
| | * 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-112-2/+2
| * | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-08-1131-12905/+13469
| |\ \
| * \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-07-181-0/+4
| |\ \ \
| * \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Xinchen Hui2014-07-176-8/+41
| |\ \ \ \
| * | | | | Fixed tests affect by local iniXinchen Hui2014-07-094-4/+8
* | | | | | 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
* | | | | | 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.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
* | | | | | Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context opt...Ferenc Kovacs2014-08-061-1/+1
* | | | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-08-061-1/+1
|\ \ \ \ \ \
| * | | | | | Add SO_REUSEPORT + SO_BROADCAST support via socket stream context optionDaniel Lowrey2014-08-051-1/+1
| * | | | | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-08-053-1/+28
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-08-053-1/+28
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-08-041-1/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-08-041-1/+6
| | |\ \ \ \ \ \ \