summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pull-request/884'Stanislav Malyshev2015-02-011-0/+2
|\
| * Fix #66479: Wrong response to FCGI_GET_VALUESFrank Stolle2014-10-301-0/+2
* | Merge branch 'pull-request/1011'Stanislav Malyshev2015-02-011-2/+2
|\ \
| * | Fix for a previous commit. i read it as size_t, notssize_t.Joshua Rogers2015-02-011-3/+3
| * | Remove useless testsJoshua Rogers2015-01-211-5/+5
* | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-312-2/+6
|\ \ \
| * \ \ Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-312-2/+6
| |\ \ \
| | * \ \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-312-2/+6
| | |\ \ \
| | | * | | Use better constant since MAXHOSTNAMELEN may mean shorter nameStanislav Malyshev2015-01-311-1/+5
| | | * | | use right sizeof for memsetStanislav Malyshev2015-01-311-1/+1
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-311-1/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-311-1/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Add mitigation for CVE-2015-0235 (bug #68925)Stanislav Malyshev2015-01-311-1/+5
* | | | | | Add mitigation for CVE-2015-0235 (bug #68925)Stanislav Malyshev2015-01-311-2/+6
* | | | | | Merge branch 'incorrect_close' of github.com:MegaManSec/php-srcMichael Wallner2015-01-301-1/+1
|\ \ \ \ \ \
| * | | | | | Use correct deallocator in phpdbgJoshua Rogers2015-01-271-1/+1
* | | | | | | Squashed commit of the following:Michael Wallner2015-01-301-1/+0
* | | | | | | fix datatype mismatches, improve error checksAnatol Belski2015-01-302-14/+32
* | | | | | | Fixed bug #68945 (Unknown admin values segfault pools)Xinchen Hui2015-01-301-1/+1
* | | | | | | Merge branch 'PHP-5.6'Xinchen Hui2015-01-271-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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.6'Xinchen Hui2015-01-271-0/+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
* | | | | | | Merge branch 'PHP-5.6'Xinchen Hui2015-01-275-4/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | 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-275-9/+12
| | * | | | 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
| | * | | | | Bump yearXinchen Hui2015-01-1566-77/+77
| | * | | | | Fix bug #68784Rasmus Lerdorf2015-01-091-1/+1
| * | | | | | Slightly modify and merge PR#105 from @MegaManSecRasmus Lerdorf2015-01-212-0/+3
| * | | | | | bump yearXinchen Hui2015-01-1599-111/+111
| * | | | | | Fix bug #68784Rasmus Lerdorf2015-01-091-1/+1
* | | | | | | Remove dl() on fpm-fcgiNikita Popov2015-01-261-12/+1
* | | | | | | zend_read_property() has to provide a holder for return value.Dmitry Stogov2015-01-221-2/+2
* | | | | | | Slightly modify and merge PR#105 from @MegaManSecRasmus Lerdorf2015-01-212-0/+3
| |_|_|_|/ / |/| | | | |
* | | | | | Remove dead codesXinchen Hui2015-01-191-36/+3
* | | | | | Weird, is nobody compiling this?Rasmus Lerdorf2015-01-151-2/+2
* | | | | | bump yearXinchen Hui2015-01-15113-126/+126
* | | | | | Faster sorting algoXinchen Hui2015-01-144-5/+5
* | | | | | Fixed #68790 (Missing return)Xinchen Hui2015-01-101-1/+1
* | | | | | trailing whitespace removalStanislav Malyshev2015-01-1072-972/+972
* | | | | | Fix bug #68784Rasmus Lerdorf2015-01-091-1/+1
* | | | | | These tests all assume that IPV6 is available.Rasmus Lerdorf2015-01-095-5/+20
* | | | | | Merge branch 'PHP-5.6'Remi Collet2015-01-061-2/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-061-2/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | cleanup old unused typedefRemi Collet2015-01-061-2/+0