Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Keyur Govande | 2014-08-15 | 11 | -20/+187 |
|\ | |||||
| * | Fix another failing test | Keyur Govande | 2014-08-15 | 1 | -1/+9 |
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Keyur Govande | 2014-08-15 | 10 | -18/+158 |
| |\ | |||||
| | * | Merge branch 'pull-request/772' into PHP-5.4 | Keyur Govande | 2014-08-15 | 10 | -18/+158 |
| | |\ | |||||
| | | * | Fix failing tests | Keyur Govande | 2014-08-14 | 7 | -14/+29 |
| | | * | Patch for bug #67839 (mysqli does not handle 4-byte floats correctly) | Keyur Govande | 2014-08-14 | 3 | -4/+129 |
| | * | | Fix bug #67716 - Segfault in cdf.c | Remi Collet | 2014-08-14 | 1 | -1/+1 |
* | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-08-14 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-14 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix bug #67716 - Segfault in cdf.c | Remi Collet | 2014-08-14 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-14 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | fix test | Stanislav Malyshev | 2014-08-14 | 1 | -1/+2 |
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-14 | 4 | -39/+99 |
| |\ \ \ | | |/ / | |||||
| | * | | split the glob() test to test different basedir | Anatol Belski | 2014-08-14 | 4 | -39/+99 |
| * | | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-08-14 | 2 | -4/+60 |
| |\ \ \ | | |/ / | |||||
| | * | | fixed glob() edge case on windows, ref bug #47358 | Anatol Belski | 2014-08-14 | 2 | -0/+57 |
| | * | | - fix bug #47358, glob returns error, should be empty array() | Pierre Joye | 2014-08-14 | 2 | -4/+3 |
| | |/ | |||||
| * | | Some changes were lost in the merge commit of #66091 | Tjerk Meesters | 2014-08-13 | 1 | -4/+14 |
| * | | Fixed #66091 | Tjerk Meesters | 2014-08-13 | 2 | -16/+22 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-08-13 | 2 | -20/+28 |
|\ \ \ | |||||
| * \ \ | Merge branch 'PHP-5.4' into PHP-5.5 | Tjerk Meesters | 2014-08-13 | 2 | -20/+36 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Fixed #66091 | Tjerk Meesters | 2014-08-13 | 2 | -15/+21 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-08-12 | 1 | -3/+30 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-08-12 | 1 | -3/+30 |
| |\ \ | | |/ | |||||
| | * | backported the fix for bug #41577 | Anatol Belski | 2014-08-12 | 1 | -3/+30 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2014-08-12 | 3 | -10/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Ferenc Kovacs | 2014-08-12 | 3 | -10/+10 |
| |\ \ | | |/ | |||||
| | * | fix the failing date tests introduced with the latest timezonedb update | Ferenc Kovacs | 2014-08-12 | 3 | -10/+10 |
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Xinchen Hui | 2014-08-11 | 6 | -6/+10 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong... | Xinchen Hui | 2014-08-11 | 2 | -2/+2 |
| * | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 | Xinchen Hui | 2014-08-11 | 31 | -12905/+13469 |
| |\ \ | |||||
| * \ \ | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 | Xinchen Hui | 2014-07-18 | 1 | -0/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 | Xinchen Hui | 2014-07-17 | 6 | -8/+41 |
| |\ \ \ \ | |||||
| * | | | | | Fixed tests affect by local ini | Xinchen Hui | 2014-07-09 | 4 | -4/+8 |
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-08-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-08-07 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | fix TS build | Anatol Belski | 2014-08-07 | 1 | -1/+1 |
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Daniel Lowrey | 2014-08-07 | 1 | -0/+46 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Daniel Lowrey | 2014-08-07 | 1 | -0/+46 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug #41631: Observe socket read timeouts in SSL streams | Daniel Lowrey | 2014-08-07 | 1 | -0/+46 |
* | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2014-08-07 | 1 | -1315/+1389 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2014-08-07 | 1 | -1315/+1389 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | - Updated to version 2014.6 (2014f) | Derick Rethans | 2014-08-07 | 1 | -1315/+1389 |
* | | | | | | Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context opt... | Ferenc Kovacs | 2014-08-06 | 1 | -1/+1 |
* | | | | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 | Andrey Hristov | 2014-08-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option | Daniel Lowrey | 2014-08-05 | 1 | -1/+1 |
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6 | Michael Wallner | 2014-08-05 | 3 | -1/+28 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'PHP-5.4' into PHP-5.5 | Michael Wallner | 2014-08-05 | 3 | -1/+28 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-08-04 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-08-04 | 1 | -1/+6 |
| | |\ \ \ \ \ \ \ |