summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Expand)AuthorAgeFilesLines
...
| | * unused variableRemi Collet2013-05-021-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-021-102/+106
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-021-102/+106
| |\ \ | | |/
| | * fix possible null deref (detected by code coverity scan)Remi Collet2013-05-021-102/+106
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-04-301-1/+6
|\ \ \ | |/ /
| * | When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpmRemi Collet2013-04-301-1/+6
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-02-171-0/+4
|\ \ \ | |/ /
| * | Added HTTP codes as of RFC 6585Jonh Wendell2013-02-171-0/+4
* | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-01-161-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Adam Harvey2013-01-161-1/+1
| |\ \ | | |/
| | * Update the arguments in the prototype of fpm_socket_unix_test_connect().Adam Harvey2013-01-161-1/+1
| | * Happy New Year~Xinchen Hui2013-01-0115-17/+17
| * | Happy New YearXinchen Hui2013-01-0115-17/+17
| * | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2012-11-282-5/+10
| |\ \ | | |/
* | | Happy New YearXinchen Hui2013-01-0115-17/+17
* | | Merge branch 'PHP-5.3' into PHP-5.5Remi Collet2012-11-282-5/+10
|\ \ \ | | |/ | |/|
| * | Fixed Bug #63581 Possible buffer overflowRemi Collet2012-11-281-3/+4
| * | Fixed Bug #63581 Possible null dereferenceRemi Collet2012-11-281-2/+6
* | | Add missed fileXinchen Hui2012-10-241-0/+12
* | | Merge branch 'PHP-5.4'Jerome Loyet2012-09-281-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'PHP-5.3' into PHP-5.4Jerome Loyet2012-09-281-1/+1
| |\ \ | | |/
| | * Fixed bug #62216Jerome Loyet2012-09-281-1/+1
| | * - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
| | * - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
| | * - add missing php-fpm.service.inJerome Loyet2012-09-281-0/+12
| * | - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
| * | Merge branch 'fuckgit' into PHP-5.4Jerome Loyet2012-09-283-5/+674
| |\ \
| | * | - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
| | * | - Fixed bug #63085 (Systemd integration and daemonize)Jerome Loyet2012-09-289-12/+64
* | | | - Fixed bug #62887 (Only /status?plain&full gives "last request cpu")Jerome Loyet2012-09-281-9/+9
* | | | - Fixed bug #62947 (Unneccesary warnings on FPM)Jerome Loyet2012-09-281-5/+5
* | | | - fix merge (fucking git merging system ... :( )Jerome Loyet2012-09-281-0/+653
|/ / /
* | | Merge branch 'PHP-5.3' into PHP-5.4Jerome Loyet2012-09-288-664/+51
|\ \ \ | |/ / |/| / | |/
| * - Fixed bug #63085 (Systemd integration and daemonize)Jerome Loyet2012-09-288-12/+52
| * - Fixed bug #62954 (startup problems fpm / php-fpm)Jerome Loyet2012-09-276-57/+59
* | - Fixed bug #62954 (startup problems fpm / php-fpm)Jerome Loyet2012-09-286-57/+59
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-09-053-5/+5
|\ \ | |/
| * year++Xinchen Hui2012-09-053-5/+5
| * Fix bug #62654Rasmus Lerdorf2012-07-251-3/+3
| * - Fixed bug #62205 (php-fpm segfaults (null passed to strstr))Jerome Loyet2012-06-013-4/+44
| * - fix missing include for unix socketsJerome Loyet2012-06-011-0/+1
| * - Comment unused function to avoid warningsJerome Loyet2012-06-011-0/+4
| * Fixed bug #61218 (the previous patch was not enough restritive on fcgi name s...Jerome Loyet2012-05-261-6/+42
| * Fixed bug #61218 (FPM drops connection while receiving some binary valuesin F...Jerome Loyet2012-05-261-40/+8
| * - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and...Jerome Loyet2012-05-264-2/+5
| * - Fixed bug #62160 (Add process.priority to set nice(2) priorities)Jerome Loyet2012-05-264-0/+65
| * - add missing headers to avoid warningsJerome Loyet2012-05-261-0/+2
| * - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be l...Jerome Loyet2012-05-252-0/+26
| * - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)Jerome Loyet2012-05-259-31/+135
| * - Fixed bug #61026 (FPM pools can listen on the same address)Jerome Loyet2012-05-231-1/+15