summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pull-request/341'Stanislav Malyshev2013-06-107-7/+7
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-102-2/+2
|\
| * typo fixes (argument)Veres Lajos2013-06-101-1/+1
| * typo fixes (accommodate, parameter)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
* | | 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
| * | Forgot to fix the test on 5.4Nikita Popov2013-03-281-1/+1
* | | Revert "Fix conversion from unsigned char to char"David Soria Parra2013-04-291-1/+1
* | | Fix conversion from unsigned char to charDavid Soria Parra2013-04-261-1/+1
* | | leave a sane environment behind (even if empty) when exitingNuno Lopes2013-04-071-0/+4
* | | missed part of the patchXinchen Hui2013-03-291-0/+1
* | | Fixed bug #64544 (Valgrind warnings after using putenv)Xinchen Hui2013-03-292-5/+27
* | | Merge branch 'pull-request/313' into PHP-5.5Keyur Govande2013-03-292-5/+9
|\ \ \
| * | | Patch for Bug #64544.Keyur Govande2013-03-292-5/+9
* | | | Fix Bug #64545: PHP Error in ef93a93ee21bce9218188Nikita Popov2013-03-281-1/+1
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-03-281-2/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Attempt to fix SKIPXinchen Hui2013-03-281-2/+7
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-03-281-1/+1
|\ \ \ \ | |/ / /
| * | | Fix test on Mac (\D shows up)Xinchen Hui2013-03-281-1/+1
* | | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-03-281-0/+62
|\ \ \ \ | |/ / /
| * | | Add test for #64529Xinchen Hui2013-03-281-0/+62
* | | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-03-241-3/+29
|\ \ \ \ | |/ / /
| * | | Document embedded server options in manpageJohannes Schlüter2013-03-241-1/+27
| * | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-03-241-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | It's 2013, even for a manpageJohannes Schlüter2013-03-241-2/+2
* | | | Merge branch 'PHP-5.4' into PHP-5.5Pierre Joye2013-03-241-0/+2
|\ \ \ \ | |/ / /
| * | | - add reminder for checking return valuesPierre Joye2013-03-241-0/+2