summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Expand)AuthorAgeFilesLines
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-1311-212/+206
* Merge branch 'PHP-5.6'Remi Collet2014-12-109-4/+300
|\
| * Fix bug #68526 Implement POSIX Access Control List for UDSRemi Collet2014-12-109-4/+300
* | Merge branch 'PHP-5.6'Remi Collet2014-12-013-2/+4
|\ \ | |/
| * XFAIL as catch_workers_output = yes seems not reliableRemi Collet2014-12-013-2/+4
* | Merge branch 'PHP-5.6'Remi Collet2014-11-293-7/+19
|\ \ | |/
| * Move chown to fpm_unix_set_socket_premissions()Remi Collet2014-11-293-7/+19
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-1/+1
* | FPM: change "listen = port" behavior from IPv4 catch-all to IPv6 catch-all (+...Remi Collet2014-11-242-17/+5
* | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-1/+1
* | Merge branch 'PHP-5.6'Remi Collet2014-11-226-4/+163
|\ \ | |/
| * 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
* | Merge branch 'PHP-5.6'Remi Collet2014-11-211-0/+67
|\ \ | |/
| * add test for fastcgi_finish_request()Remi Collet2014-11-211-0/+67
* | Merge branch 'PHP-5.6'Remi Collet2014-11-212-1/+88
|\ \ | |/
| * 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.6'Remi Collet2014-11-202-12/+32
|\ \ \ | |/ /
| * | 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
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-201-0/+7
|\ \ \ | |/ /
| * | run a few request in this testRemi Collet2014-11-201-0/+7
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-201-4/+9
|\ \ \ | |/ /
| * | 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
* | | 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
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-201-12/+28
|\ \ \ | |/ /
| * | Factorization and consistencyRemi Collet2014-11-201-12/+28
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-191-4/+17
|\ \ \ | |/ /
| * | 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
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-182-1/+56
|\ \ \ | |/ /
| * | add test for bug #68381Remi Collet2014-11-181-0/+54
| * | Fixed bug #68381 Set FPM log level earlier during initDavid Zuelke2014-11-181-1/+2
* | | Merge branch 'PHP-5.6'Remi Collet2014-11-1810-32/+16
|\ \ \ | |/ /
| * | simplify fpm testsRemi Collet2014-11-1810-32/+16