summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-311-0/+2
|\ \ \ | |/ /
| * | add NEWSStanislav Malyshev2015-01-311-0/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-312-0/+19
|\ \ \ | |/ /
| * | Added test and possible fix for https://bugs.php.net/bug.php?id=67068Danack2015-01-312-0/+19
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-317-18/+18
|\ \ \ | |/ /
| * | 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
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-317-5/+50
|\ \ \ | |/ /
| * | 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
* | | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2015-02-011-1/+1
|\ \ \ | |/ /
| * | Fixed typo in commentYasuo Ohgaki2015-02-011-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2015-01-291-1/+1
|\ \ \ | |/ /
| * | Use bash rather than shYasuo Ohgaki2015-01-291-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Yasuo Ohgaki2015-01-292-1/+4
|\ \ \ | |/ /
| * | Fixed Bug #68941 mod_files.sh is a bash-scriptYasuo Ohgaki2015-01-292-1/+4
* | | Update NewsXinchen Hui2015-01-291-0/+3
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-01-291-1/+1
|\ \ \ | |/ /
| * | Fixed bug #68901 (use after free)Xinchen Hui2015-01-292-1/+4
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-01-271-1/+1
|\ \ \ | |/ /
| * | fcgi_write in fpm returns ssizt_t, but it returns int in cgiXinchen Hui2015-01-271-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-01-271-0/+1
|\ \ \ | |/ /
| * | Revert previous unintentional change to thisXinchen Hui2015-01-271-0/+1
* | | Update NEWsXinchen Hui2015-01-271-0/+4
* | | Merge branch 'PHP-5.5' into PHP-5.6Xinchen Hui2015-01-275-4/+12
|\ \ \ | |/ /
| * | 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
* | | | Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6Bob Weinand2015-01-263-1/+60
|\ \ \ \ | |/ / /
| * | | Add NEWS entryBob Weinand2015-01-261-0/+3
| * | | Fix call after close if multiple filters are attachedBob Weinand2015-01-262-1/+57
* | | | Merge branch 'PHP-5.5' into PHP-5.6Keyur Govande2015-01-261-0/+6
|\ \ \ \ | |/ / /
| * | | 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
* | | | 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.5' into PHP-5.6Ferenc Kovacs2015-01-221-6/+7
|\ \ \ \ | |/ / /
| * | | 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
* | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-220-0/+0
|\ \ \ \ | |/ / /
| * | | move CVE to the right versionRemi Collet2015-01-221-2/+2
* | | | Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifsAnatol Belski2015-01-223-0/+16
* | | | Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctlyAnatol Belski2015-01-225-29325/+28936
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-221-1/+1
|\ \ \ \ | |/ / /
| * | | simplify error handling for dirs as magicAnatol Belski2015-01-221-1/+1
* | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Anatol Belski2015-01-222-0/+3
|\ \ \ \