summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | move zlog_set_level() againDavid Zuelke2014-11-212-2/+1
| * | Change pm.start_servers default warning to noticeDavid Zuelke2014-11-211-1/+1
* | | typo fixFerenc Kovacs2014-11-261-1/+1
* | | go back with phpdbg to the state of 5.6.3, reverting the controversial commit...Ferenc Kovacs2014-11-2655-8124/+2673
* | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-238-10/+10
* | | minor typo in testRemi Collet2014-11-221-1/+1
* | | add test for global / pool prefix and bug #68478Remi Collet2014-11-222-0/+156
* | | Fixed Bug #68478 acess_log don't use prefixRemi Collet2014-11-223-3/+6
* | | add test for fastcgi_finish_request()Remi Collet2014-11-211-0/+67
* | | add test for #68391Remi Collet2014-11-211-0/+87
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-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
| |\ \
| * | | made lsapi_main.c compatible with PHP7/phpng .George Wang2014-11-201-26/+92
* | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6George Wang2014-11-2025-80/+1594
|\ \ \ \
| * | | | adapt test for error message introduce in fix for #68463Remi Collet2014-11-201-12/+28
| * | | | Fix bug #68463 listen.allowed_clients can silently result in no allowed accessRemi Collet2014-11-201-0/+4
| * | | | run a few request in this testRemi Collet2014-11-201-0/+7
| * | | | Raise a warning when listen = hostname used and is resolved as multiple addre...Remi Collet2014-11-201-4/+9
| * | | | Fixed #68458 Change pm.start_servers default warning to noticeRemi Collet2014-11-201-0/+64
| * | | | fix test descriptionDavid Zuelke2014-11-201-1/+1
| * | | | tests for #895David Zuelke2014-11-201-0/+54
| * | | | move zlog_set_level() againDavid Zuelke2014-11-202-2/+1
| * | | | Change pm.start_servers default warning to noticeDavid Zuelke2014-11-201-1/+1
| * | | | Factorization and consistencyRemi Collet2014-11-201-12/+28
| * | | | Fixed bug #68452 php-fpm man page is oudated (-O)Remi Collet2014-11-191-0/+7
| * | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-191-4/+10
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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