summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | 5.5.17 nowJulien Pauli2014-08-063-4/+7
| * | | | | | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-08-066-9/+88
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-050-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-050-0/+0
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | Add SO_REUSEPORT + SO_BROADCAST support via socket stream context optionDaniel Lowrey2014-08-056-9/+76
| | * | | | | | | | | BFNMichael Wallner2014-08-051-0/+4
| | * | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-08-053-1/+28
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | BFNMichael Wallner2014-08-051-0/+4
| | | * | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-08-053-1/+28
| | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | typoRemi Collet2014-08-041-1/+1
| | * | | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | typoRemi Collet2014-08-041-1/+1
| | | * | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-08-040-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | NEWSRemi Collet2014-08-041-0/+4
| | * | | | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-08-041-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | NEWSRemi Collet2014-08-041-0/+4
| | | * | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-08-041-1/+6
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-08-041-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-08-041-0/+8
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-041-0/+35
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-044-21/+76
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix bug #67705 (extensive backtracking in rule regular expression)Stanislav Malyshev2014-08-045-13/+113
| * | | | | | | | | | | | | | | | Use callback structureAndrey Hristov2014-08-062-5/+7
| * | | | | | | | | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-08-0611-32/+305
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | / / / / / / | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-061-12/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Add EXPECTFAndrey Hristov2014-08-061-12/+34
| | * | | | | | | | | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2014-08-0611-40/+281
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / / / | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Andrey Hristov2014-08-0612-27/+167
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | 5.4.33-dev nowStanislav Malyshev2014-08-053-4/+6
| | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Fixed Bug #67724Michael Wallner2014-08-054-1/+32
| | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | typoRemi Collet2014-08-041-1/+1
| | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | NEWSRemi Collet2014-08-041-0/+4
| | | | * | | | | | | | Fixed Bug #66901 php-gd 'c_color' NULL pointer dereferenceRemi Collet2014-08-041-1/+6
| | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | * | | | | | | backport the fix for bug #67739Anatol Belski2014-08-041-0/+8
| | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | add testStanislav Malyshev2014-08-041-0/+35
| | | | |/ / / / /
| | | | * | | | | Fix bug #67705 (extensive backtracking in rule regular expression)Stanislav Malyshev2014-08-044-21/+76
| | | * | | | | | Fix handling of multi-result sets with PS...used to clean not onlyAndrey Hristov2014-08-062-17/+132
| | | |/ / / / /
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-07-311-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix wrong lenght sizeAndrey Hristov2014-07-311-1/+1
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Peter Cowburn2014-07-312-11514/+11512
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Peter Cowburn2014-07-312-11514/+11512
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch 'pull-request/754' into PHP-5.4Peter Cowburn2014-07-312-11514/+11512
| | | |\ \ \ \ \
| | | | * | | | | Bug #51096 - Remove unnecessary ? for first/last day ofPeter Cowburn2014-07-312-11514/+11512
| | | |/ / / / /
| * | | | | | | Moved streams related functions to xp_ssl.cTjerk Meesters2014-07-312-57/+57
| * | | | | | | Remove duplicate NEWSKeyur Govande2014-07-301-4/+0
| * | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2014-07-300-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'PHP-5.4' into PHP-5.5Keyur Govande2014-07-300-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Update NEWSKeyur Govande2014-07-301-0/+4
| | * | | | | | Update NEWSKeyur Govande2014-07-301-0/+4