summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
* | Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserverLars Strojny2012-09-183-0/+48
* | Respond with 501 to unknown request methodsNiklas Lindgren2012-09-154-22/+71
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-09-058-12/+12
|\ \ | |/
| * year++Xinchen Hui2012-09-057-11/+11
| * Fix bug #62654Rasmus Lerdorf2012-07-251-3/+3
* | Merging PR 121 to add support for slow request counting on the PHP-FPM status...Lars Strojny2012-08-267-13/+24
* | Fix test failedXinchen Hui2012-08-181-2/+2
* | - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not ...Felipe Pena2012-08-161-1/+4
* | Fixed bug #62725 (Calling exit() in a shutdown function does not return the e...Xinchen Hui2012-08-021-3/+3
* | Sleep a little bit more, in some slow machine (like gcov), it will take a lit...Xinchen Hui2012-08-011-1/+1
* | Implemented FR #62700 (have the console output 'Listening on http://localhost...Xinchen Hui2012-07-311-1/+1
* | Fix bug #62654Rasmus Lerdorf2012-07-241-3/+3
* | Fix Bug #62612 readline extension compilation failsJohannes Schlüter2012-07-221-0/+2
* | Improve error message for ssl requestXinchen Hui2012-07-221-1/+5
* | Fix test (no charset outputed)Xinchen Hui2012-07-181-1/+1
* | - Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds inste...Felipe Pena2012-07-081-1/+1
* | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2012-06-271-0/+3
|\ \ | |/
| * Fix memleak in CLIJohannes Schlüter2012-06-271-0/+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
* | Fix potential leak in cli serverstealth352012-06-161-0/+3
* | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Jerome Loyet2012-06-011-1/+10
|\ \
| * \ Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-05-291-1/+10
| |\ \ | | |/
| | * Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phptMatt Ficken2012-05-291-1/+10
| | * 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
| | * - Fixed bug #61295 (php-fpm should not fail with commented 'user' for non-roo...Jerome Loyet2012-05-231-2/+2
| | * - Fix help message for '-R'Jerome Loyet2012-05-231-1/+1
| | * - add missing help message for '-R'Jerome Loyet2012-05-231-1/+4
| | * - Fixed bug #61835 (php-fpm is not allowed to run as root)Jerome Loyet2012-05-234-9/+18