summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-045-5/+5
|\
| * non living code related typo fixesVeres Lajos2013-08-045-5/+5
| * typo fixesVeres Lajos2013-07-152-2/+2
* | HASH_KEY_NON_EXISTANT fixVeres Lajos2013-07-211-1/+1
* | typo fixesVeres Lajos2013-07-152-2/+2
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-07-142-12/+13
|\ \ | |/
| * Add built-in web server to invocation listLior Kaplan2013-07-141-1/+2
| * Terminology: change embedded web server to built-in web server to align with ...Lior Kaplan2013-07-141-3/+3
| * Align -B and -E parameter names with cli usage (begin_code and end_code)Lior Kaplan2013-07-141-8/+8
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-07-021-1/+1
|\ \ | |/
| * fix typo in php man pageRemi Collet2013-07-021-1/+1
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-07-024-0/+8
|\ \ | |/
| * Fixed Bug #65143 Missing php-cgi man pageRemi Collet2013-07-024-0/+8
* | Added PHP_FCGI_BACKLOG, overrides the default listen backlogArnaud Le Blanc2013-06-291-1/+5
* | 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.5Adam Harvey2013-06-204-18/+151
|\ \ | |/
| * Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.Adam Harvey2013-06-201-8/+8
| * Change the search in get_status_string() to correctly handle unknown codes.Adam Harvey2013-06-204-13/+146
* | 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-107-7/+7
* | 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
|\ \ \ | |/ /
View Lorry Controller Status