summaryrefslogtreecommitdiff
path: root/sapi/fpm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5'Rasmus Lerdorf2013-10-311-0/+1
|\
| * Fix bug #66008Rasmus Lerdorf2013-10-311-0/+1
* | Merge branch 'master' of https://git.php.net/repository/php-srcAntony Dovgal2013-10-281-1/+4
|\ \
| * | fix limitation of upload size == (U)INT_MAX in CGIMichael Wallner2013-10-281-1/+4
* | | Merge branch 'PHP-5.5'Antony Dovgal2013-10-272-3/+3
|\ \ \ | |/ / |/| / | |/
| * increase backlog to the highest value everywhereAntony Dovgal2013-10-272-3/+3
* | Merge branch 'master' of https://github.com/guggemand/php-srcMichael Wallner2013-10-212-2/+8
|\ \
| * | Dont reset other counters when incrementing slow_rqKarsten Schmidt2013-02-202-2/+8
* | | Merge branch 'master' of https://github.com/DylanArnold/php-srcMichael Wallner2013-10-211-1/+2
|\ \ \ | |_|/ |/| |
| * | Call php_module_shutdown() for php-fpm child processesDylan Arnold2013-09-091-1/+2
* | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2013-10-201-1/+1
|\ \ \
| * | | Fix typoRasmus Lerdorf2013-10-201-1/+1
* | | | Merge branch 'PHP-5.4' into PHP-5.5Rasmus Lerdorf2013-10-193-4/+5
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Initialize these to make Coverity happyRasmus Lerdorf2013-10-191-2/+3
| * | Typo fix: managment -> managementLior Kaplan2013-10-191-1/+1
| * | Use minus sign instead of hyphenLior Kaplan2013-10-191-1/+1
* | | Fix long-standing visual pain point: the misalignment of './configure help' t...Christopher Jones2013-08-061-4/+4
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-041-1/+1
|\ \ \ | |/ /
| * | non living code related typo fixesVeres Lajos2013-08-041-1/+1
| * | typo fixesVeres Lajos2013-07-151-1/+1
* | | HASH_KEY_NON_EXISTANT fixVeres Lajos2013-07-211-1/+1
* | | typo fixesVeres Lajos2013-07-151-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-06-261-0/+13
|\ \ \ | |/ /
| * | - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuk...Felipe Pena2013-06-261-0/+13
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-161-1/+15
|\ \ \ | |/ /
| * | Fix bug #64764: Add status option to fpm init.d scriptLior Kaplan2013-06-161-1/+15
| * | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
* | | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-101-1/+1
|\ \ \ | |/ /
| * | typo fixes (argument)Veres Lajos2013-06-101-1/+1
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-241-0/+4
|\ \ \ | |/ /
| * | Fixed Bug #64915 (error_log ignored when daemonize=0)Remi Collet2013-05-241-0/+4
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-218-2/+189
|\ \ \ | |/ /
| * | Add --with-fpm-systemd option to report health to systemd, andRemi Collet2013-05-218-2/+189
* | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-034-4/+12
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-034-4/+12
| |\ \
| | * | From code coverity scan, syscall return value must be check.Remi Collet2013-05-034-4/+12
* | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-022-1/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-022-1/+6
| |\ \ \ | | |/ /
| | * | fix more resource leaksRemi Collet2013-05-022-1/+6
* | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-023-5/+27
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-023-5/+27
| |\ \ \ | | |/ /
| | * | From code coverity scanRemi Collet2013-05-023-5/+27
* | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-021-6/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-021-6/+6
| |\ \ \ | | |/ /
| | * | fixed size array cannot be nullRemi Collet2013-05-021-6/+6
* | | | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-021-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-021-3/+3
| |\ \ \ | | |/ /
| | * | use limit_extensions as we use security_limit_extensions later (free)Remi Collet2013-05-021-2/+2
| | * | unused variableRemi Collet2013-05-021-1/+1