summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | * pull-request/341: (23 commits) typofixes
* typo fixes (argument)Veres Lajos2013-06-101-1/+1
|
* typo fixes (accommodate, parameter)Veres Lajos2013-06-101-1/+1
|
* Fixed Bug #64915 (error_log ignored when daemonize=0)Remi Collet2013-05-241-0/+4
| | | | | Use configured error_log file when stderr is not a tty. So only use tty during interactive debug run.
* Add --with-fpm-systemd option to report health to systemd, andRemi Collet2013-05-218-2/+189
| | | | | | | | | | | | | systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file. Systemd status line will looks like: Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec" Watchdog mode is also supported. In this case watchdog interval, configured in the unit file, override the systemd_interval option. When not used (default), no change from previous version.
* Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-034-4/+12
|\ | | | | | | | | * PHP-5.3: From code coverity scan, syscall return value must be check.
| * From code coverity scan, syscall return value must be check.Remi Collet2013-05-034-4/+12
| | | | | | | | | | | | | | | | To not alter current behaviour, we simply log the problem, so, if it occurs, the message will give explanation. This are only warning as they don't block the server, but such fail can explain strange (not expected) behaviour later.
* | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-022-1/+6
|\ \ | |/ | | | | | | * PHP-5.3: fix more resource leaks
| * fix more resource leaksRemi Collet2013-05-022-1/+6
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-023-5/+27
|\ \ | |/ | | | | | | * PHP-5.3: From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
| * From code coverity scanRemi Collet2013-05-023-5/+27
| | | | | | | | | | | | | | - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
* | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-021-6/+6
|\ \ | |/ | | | | | | * PHP-5.3: fixed size array cannot be null
| * fixed size array cannot be nullRemi Collet2013-05-021-6/+6
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2013-05-021-3/+3
|\ \ | |/ | | | | | | | | * PHP-5.3: use limit_extensions as we use security_limit_extensions later (free) unused variable
| * 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.3' into PHP-5.4Remi Collet2013-05-021-102/+106
|\ \ | |/ | | | | | | * PHP-5.3: fix possible null deref (detected by code coverity scan)
| * fix possible null deref (detected by code coverity scan)Remi Collet2013-05-021-102/+106
| |
* | When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpmRemi Collet2013-04-301-1/+6
| | | | | | | | | | | | | | | | | | | | the SCRIPT_FILENAME may contains the QUERY_STRING. Ex : RewriteRule ^(.*)\.php$ fcgi://127.0.0.1:9000/$1.php [P] From apache debug (build with -DFCGI_DUMP_ENV_VARS) AH01062: sending env var 'SCRIPT_FILENAME' value 'proxy:fcgi://127.0.0.1:9000/var/www/html/info.php?foo' AH01071: Got error 'Primary script unknown\n'
* | Forgot to fix the test on 5.4Nikita Popov2013-03-281-1/+1
| |
* | Attempt to fix SKIPXinchen Hui2013-03-281-2/+7
| |
* | Fix test on Mac (\D shows up)Xinchen Hui2013-03-281-1/+1
| |
* | Add test for #64529Xinchen Hui2013-03-281-0/+62
| |
* | 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
| |
* | - add reminder for checking return valuesPierre Joye2013-03-241-0/+2
| |
* | - fix x64 issues on windows with the various time types (overflow, signed ↵Pierre Joye2013-03-231-16/+43
| | | | | | | | | | | | and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too Signed-off-by: Anatol Belski <ab@php.net>
* | Added HTTP codes as of RFC 6585Jonh Wendell2013-02-173-0/+12
| | | | | | | | | | | | | | | | | | Added descriptions for the new HTTP codes: - 428 Precondition Required - 429 Too Many Requests - 431 Request Header Fields Too Large - 511 Network Authentication Required
* | Fixed bug #64128 buit-in web server is broken on ppc64.Remi Collet2013-02-011-17/+13
| | | | | | | | | | | | fdset management using bit operator is broken on non-x86 arch and cause built-in server the enter an infinite loop of "select" and never handle any request.
* | Merge branch 'PHP-5.3' into PHP-5.4Adam Harvey2013-01-161-1/+1
|\ \ | |/ | | | | | | * PHP-5.3: Update the arguments in the prototype of fpm_socket_unix_test_connect().
| * Update the arguments in the prototype of fpm_socket_unix_test_connect().Adam Harvey2013-01-161-1/+1
| | | | | | | | Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
| * Happy New Year~Xinchen Hui2013-01-0161-69/+69
| |
* | sapi/litespeed/lsapi_main.c: Fix bug #63228George Wang2013-01-081-1/+1
| | | | | | | | | | Fix compiling error at line 606 (error: format not a string literal and no format arguments [-Werror=format-security]
* | Bug #43177: If an eval() has a parse error, the overall exit status and ↵Stanislav Malyshev2013-01-011-0/+82
| | | | | | | | | | | | | | return code should not be affected. Without this fix, a webpage using eval() may return code 500. That might display fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
* | Happy New YearXinchen Hui2013-01-0162-70/+70
| |
* | update test for supported Mime Types checkingpascalc2012-12-141-133/+31
| |
* | update list of common Mime Types in PHP development server to support Web ↵pascalc2012-12-141-1/+4
| | | | | | | | audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together
* | Merge branch 'PHP-5.3' into PHP-5.4Remi Collet2012-11-282-5/+10
|\ \ | |/ | | | | | | | | * PHP-5.3: Fixed Bug #63581 Possible buffer overflow Fixed Bug #63581 Possible null dereference
| * Fixed Bug #63581 Possible buffer overflowRemi Collet2012-11-281-3/+4
| | | | | | | | | | | | | | | | | | In fpm-log, possible buffer overflow. Check for length is done at the beginning of the loop, so is not done when overflow occurs on the last loop (len = 1024 or 1025). (ack from fat). This issue where found from by static code analysis tool and, so, I can't provide any reproducer.
| * Fixed Bug #63581 Possible null dereferenceRemi Collet2012-11-281-2/+6
| | | | | | | | | | | | | | | | Possible NULL dereference when trying to delete the single item of a list (ack from fat). This issues where found from by static code analysis tool and, so, I can't provide any reproducer.
* | Fixed test sapi/cli/tests/006.phptAnatoliy Belsky2012-11-141-1/+1
| | | | | | | | Third param in preg_match_all() is optional for a while )
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-11-131-10/+10
|\ \ | |/ | | | | | | | | | | | | * PHP-5.3: Enabled apache 2.4 handler build option Conflicts: sapi/apache2handler/config.w32
| * Enabled apache 2.4 handler build optionPierre Joye2012-11-131-0/+19
| |
* | Implemented FR #63242 (Default error page in PHP built-in web server uses ↵Xinchen Hui2012-10-103-33/+21
| | | | | | | | outdated html/css)
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-101-0/+0
|\ \ | |/
| * Remove executable permission on phptXinchen Hui2012-10-101-0/+0
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Jerome Loyet2012-09-281-1/+1
|\ \ | |/ | | | | | | * PHP-5.3: Fixed bug #62216
| * Fixed bug #62216Jerome Loyet2012-09-281-1/+1
| | | | | | | | Add PID to php-fpm init.d script
View Lorry Controller Status