summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Conflicts:Nayana Hettiarachchi2015-02-052-0/+6
* Updated NEWSJulien Pauli2015-02-041-2/+0
* Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"Julien Pauli2015-02-042-18/+1
* 5.5.23 nowJulien Pauli2015-02-043-8/+7
* Revert "json_decode() should generate a syntax error when given ""."Julien Pauli2015-02-043-19/+2
* Update NEWSYasuo Ohgaki2015-02-031-0/+5
* Fixed Bug #65199 pg_copy_from() modifies input array variableYasuo Ohgaki2015-02-032-10/+66
* Fixed Bug #66623 no EINTR check on flock(LOCK_EX)Yasuo Ohgaki2015-02-031-2/+5
* Fixed bug #68063 Empty session IDs do still start sessionsYasuo Ohgaki2015-02-032-0/+25
* Bug #61470 is fixed only in masterYasuo Ohgaki2015-02-031-21/+0
* Fixed bug #65272: correctly set flock() out param in windowsDaniel Lowrey2015-02-023-0/+34
* Let's not assume bash is always /bin/bash.Adam Harvey2015-02-021-2/+2
* json_decode() should generate a syntax error when given "".Adam Harvey2015-02-024-2/+23
* Add test for bug #61470. It is already fixed.Yasuo Ohgaki2015-02-021-0/+21
* Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Stanislav Malyshev2015-02-011-17289/+17211
|\
| * - Updated to version 2015.1 (2015a)Derick Rethans2015-02-011-17289/+17211
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-02-011-1/+1
|\ \ | |/ |/|
| * fix sizeof sizeStanislav Malyshev2015-02-011-1/+1
* | Fix #66479: Wrong response to FCGI_GET_VALUESFrank Stolle2015-02-012-2/+5
* | Fix bug #64938: libxml_disable_entity_loader setting is shared between threadsMartin Jansen2015-02-012-0/+10
* | fix group name handlingStanislav Malyshev2015-01-311-1/+1
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-311-2/+2
|\ \ | |/
| * fix TSRMStanislav Malyshev2015-01-311-2/+2
* | add NEWSStanislav Malyshev2015-01-311-0/+2
* | Added test and possible fix for https://bugs.php.net/bug.php?id=67068Danack2015-01-312-0/+19
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-317-18/+18
|\ \ | |/
| * Use better constant since MAXHOSTNAMELEN may mean shorter nameStanislav Malyshev2015-01-315-12/+16
| * use right sizeof for memsetStanislav Malyshev2015-01-311-1/+1
* | Add mitigation for CVE-2015-0235 (bug #68925)Stanislav Malyshev2015-01-314-3/+9
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-314-2/+40
|\ \ | |/
| * Add mitigation for CVE-2015-0235 (bug #68925)Stanislav Malyshev2015-01-315-2/+44
* | Fixed typo in commentYasuo Ohgaki2015-02-011-1/+1
* | Use bash rather than shYasuo Ohgaki2015-01-291-1/+1
* | Fixed Bug #68941 mod_files.sh is a bash-scriptYasuo Ohgaki2015-01-292-1/+4
* | Fixed bug #68901 (use after free)Xinchen Hui2015-01-292-1/+4
* | fcgi_write in fpm returns ssizt_t, but it returns int in cgiXinchen Hui2015-01-271-1/+1
* | Revert previous unintentional change to thisXinchen Hui2015-01-271-0/+1
* | Also Fixed #68571 in CGI SAPI, and some cleanupXinchen Hui2015-01-276-9/+17
* | Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src int...Xinchen Hui2015-01-272-1/+6
|\ \
| * | follow C89 formatredfoxli2014-12-101-1/+2
| * | fix-bug-68571-to-php5.5redfoxli2014-12-092-1/+5
* | | Add NEWS entryBob Weinand2015-01-261-0/+3
* | | Fix call after close if multiple filters are attachedBob Weinand2015-01-262-1/+57
* | | Add NEWSKeyur Govande2015-01-261-0/+6
* | | Patch commit d9f85373e32 by moving the float_to_double function toKeyur Govande2015-01-266-46/+15
* | | Fix for bugs #68114 (Build fails on OS X due to undefined symbols)Keyur Govande2015-01-269-91/+141
* | | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2015-01-221-6/+7
|\ \ \ | | |/ | |/|
| * | fix some factual errors in the processFerenc Kovacs2015-01-221-6/+7
* | | move CVE to the right versionRemi Collet2015-01-221-2/+2
* | | simplify error handling for dirs as magicAnatol Belski2015-01-221-1/+1