summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* cleanup old unused typedefRemi Collet2015-01-061-2/+0
* 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
* Fix bug #68751 listen.allowed_clients is brokenRemi Collet2015-01-051-1/+1
* 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 possible null pointer mathAnatol Belski2014-12-011-3/+5
* | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
* | 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
* | move zlog_set_level() againDavid Zuelke2014-11-212-2/+1
* | Change pm.start_servers default warning to noticeDavid Zuelke2014-11-211-1/+1
* | Fixed bug #68391 Returns the pool config files in orderFlorian MARGAINE2014-11-211-1/+1
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5George Wang2014-11-207-46/+120
|\ \
| * | Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)Remi Collet2014-11-191-4/+10
| * | Fixed bug #68381 Set FPM log level earlier during initDavid Zuelke2014-11-181-1/+2
| * | update fpm configuration for #68428Remi Collet2014-11-171-1/+1
| * | Fixed bug #68428 allowed_client is IPv4 onlyRemi Collet2014-11-171-22/+50
| * | comment about ipv4-mapped in fpm confRemi Collet2014-11-171-2/+2
| * | Improve fix bug #68421 access.format='%R' doesn't log ipv6 addressRemi Collet2014-11-171-4/+14
| * | improve comments about FPM listen optionRemi Collet2014-11-161-2/+4
| * | Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addressesRemi Collet2014-11-151-7/+17
| * | Fix bug #68421 access.format='%R' doesn't log ipv6 addressRemi Collet2014-11-143-4/+10
| * | Fix bug #68423i PHP-FPM will no longer load all poolsRemi Collet2014-11-141-3/+14
* | | 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
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5George Wang2014-10-037-52/+111
|\ \
| * | add IPv6 support to php-fpmRobin Gloster2014-10-034-48/+98
| * | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2014-09-271-2/+0
| |\ \ | | |/
| | * This test should passJohannes Schlüter2014-09-271-2/+0
| | * Fine tuned the order of adding request variables.George Wang2014-09-081-1/+2
| | * Update LSAPI to 6.7, added support for 'filter_input'.George Wang2014-09-032-7/+67
| * | Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when us...Remi Collet2014-09-151-0/+11
| * | fixed the cast and incompatible pointer warningAnatol Belski2014-09-121-2/+2
* | | Fixed a bug that causes crash when environment variable is access while parsi...George Wang2014-10-031-1/+2
|/ /
* | Fine tuned the order of adding request variables.George Wang2014-09-091-1/+2
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5George Wang2014-09-038-33/+75
|\ \
| * \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-281-3/+8
| |\ \ | | |/
| | * restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes b...David Zuelke2014-08-281-3/+8
| * | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-18/+18
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-07-303-6/+10
| |\ \ | | |/
| | * Fixed bug #67715 (php-milter does not build and crashes randomly).Michael Wallner2014-07-303-6/+10
| | * Fixed a bug that cannot access custom request header stored in apache_request...George Wang2014-07-111-0/+1
| | * cleanup file headers.George Wang2014-07-102-16/+0