summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-02-011-0/+2
|\
| * Fix #66479: Wrong response to FCGI_GET_VALUESFrank Stolle2015-02-011-0/+2
* | 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
* | | 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
* | | 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
* | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-061-2/+0
|\ \ \ \ | |/ / /
| * | | cleanup old unused typedefRemi Collet2015-01-061-2/+0
* | | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-01-068-10/+48
|\ \ \ \ | |/ / /
| * | | Handle NULL strings in sapi_cli_server_register_variable().Adam Harvey2015-01-062-0/+39
| * | | Allow CLI server test scripts to specify the name of the router file.Adam Harvey2015-01-066-10/+9
* | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-051-1/+1
|\ \ \ \ | |/ / /
| * | | Fix bug #68751 listen.allowed_clients is brokenRemi Collet2015-01-051-1/+1
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-12-301-2/+5
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-12-301-2/+5
| |\ \ \ | | | |/ | | |/|
| | * | FIx bug #68618 (out of bounds read crashes php-cgi)Stanislav Malyshev2014-12-301-2/+5
| | * | Revert "made lsapi_main.c compatible with PHP7/phpng ."Stanislav Malyshev2014-11-221-92/+26
| | * | made lsapi_main.c compatible with PHP7/phpng .George Wang2014-11-201-26/+92
| | * | set default response code to 200George Wang2014-11-031-2/+2
| | * | Fixed a bug that causes crash when environment variable is access while parsi...George Wang2014-10-031-1/+2
* | | | fix typoRemi Collet2014-12-141-1/+1
* | | | Fix bug #68526 Implement POSIX Access Control List for UDSRemi Collet2014-12-109-4/+300
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-011-3/+5
|\ \ \ \ | |/ / /
| * | | fix possible null pointer mathAnatol Belski2014-12-011-3/+5
| * | | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
* | | | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
* | | | XFAIL as catch_workers_output = yes seems not reliableRemi Collet2014-12-013-2/+4
* | | | Move chown to fpm_unix_set_socket_premissions()Remi Collet2014-11-293-7/+19
* | | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-11-291-5/+5
|\ \ \ \ | |/ / /
| * | | fix test with readline on macFerenc Kovacs2014-11-291-5/+5
| | |/ | |/|
| * | Fixed Bug #68478 acess_log don't use prefixRemi Collet2014-11-223-3/+6
| * | Fix bug #68463 listen.allowed_clients can silently result in no allowed accessRemi Collet2014-11-211-0/+4
| * | Raise a warning when listen = hostname used and is resolved as multiple addre...Remi Collet2014-11-211-4/+9