summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-141-1/+1
|\ | | | | | | | | | | | | | | * PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c
| * Reduce (some) compile noise of 'unused variable' and 'may be used ↵Christopher Jones2013-08-141-1/+1
| | | | | | | | uninitialized' warnings.
| * Fix #61345: fix install of CGI binaryMichael Heimpold2013-08-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CLI was not built but only CGI binary, then a sequence of $ ./buildconf $ ./configure --prefix=/usr/local/phpcgi --disable-cli $ make -j8 $ sudo rm -rf /usr/local/phpcgi $ sudo make install results in the following error: /bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp ext/opcache/opcache.la /srv/smb/php-src.test/modules Installing shared extensions: /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/ Installing PHP CGI binary: /usr/local/phpcgi/bin/ cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory make: *** [install-cgi] Fehler 1 The solution is to create the binary directory before copying the CGI binary as e.g. CLI does. Signed-off-by: Oliver Metz <oliver.metz@gmx.de> [extensive commit message] Signed-off-by: Michael Heimpold <mhei@heimpold.de>
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-101-0/+1
|\ \ | | | | | | | | | | | | * PHP-5.4: Fix #61345: fix install of CGI binary
| * | Fix #61345: fix install of CGI binaryMichael Heimpold2013-08-101-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CLI was not built but only CGI binary, then a sequence of $ ./buildconf $ ./configure --prefix=/usr/local/phpcgi --disable-cli $ make -j8 $ sudo rm -rf /usr/local/phpcgi $ sudo make install results in the following error: /bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp ext/opcache/opcache.la /srv/smb/php-src.test/modules Installing shared extensions: /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/ Installing PHP CGI binary: /usr/local/phpcgi/bin/ cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory make: *** [install-cgi] Fehler 1 The solution is to create the binary directory before copying the CGI binary as e.g. CLI does. Signed-off-by: Oliver Metz <oliver.metz@gmx.de> [extensive commit message] Signed-off-by: Michael Heimpold <mhei@heimpold.de>
* | Fix long-standing visual pain point: the misalignment of './configure help' ↵Christopher Jones2013-08-0610-15/+15
| | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes.
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-045-5/+5
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c
| * 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
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: Add built-in web server to invocation list Terminology: change embedded web server to built-in web server to align with cli usage Align -B and -E parameter names with cli usage (begin_code and end_code) Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
| * 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
| | | | | | | | cli usage
| * 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
|\ \ | |/ | | | | | | * PHP-5.4: fix typo in php man page
| * 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
|\ \ | |/ | | | | | | | | | | * PHP-5.4: Fixed Bug #65142 Missing phar man page NEWS Fixed Bug #65143 Missing php-cgi man page
| * Fixed Bug #65143 Missing php-cgi man pageRemi Collet2013-07-024-0/+8
| | | | | | | | | | | | | | Currently php-cgi man page is a simple redirect to php (CLI) man page. Could be splited / improved in the future.
* | 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
|\ \ | |/ | | | | | | | | * PHP-5.4: - BFN - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
| * - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: ↵Felipe Pena2013-06-261-0/+13
| | | | | | | | chibisuke at web dot de
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-06-204-18/+151
|\ \ | |/ | | | | | | | | * PHP-5.4: Fix the spelling of the php_cli_server_http_response_status_code_pair typedef. Change the search in get_status_string() to correctly handle unknown codes.
| * Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.Adam Harvey2013-06-201-8/+8
| | | | | | | | | | Specifically: php_cli_server_http_reponse_status_code_pair → php_cli_server_http_response_status_code_pair.
| * Change the search in get_status_string() to correctly handle unknown codes.Adam Harvey2013-06-204-13/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This previously used a buggy implementation of binary search that would loop infinitely for unknown codes when searching in reason arrays of particular sizes (such as the one we have at the moment). Since C provides bsearch(), we'll just use that instead, since libc authors hopefully get this right. There was also an additional bug that was masked by the first one: the design was that an unknown code would result in get_status_string() returning NULL, which would then result in a segfault in append_http_status_line(), since it assumed that it would always receive a valid string pointer that could be handed off to smart_str_appends_ex(). We'll now return a placeholder in that case. Fixes bug #65066 (Cli server not responsive when responding with 422 http status code).
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-161-1/+15
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #64764: Add status option to fpm init.d script
| * 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
* | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-107-7/+7
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-102-2/+2
|\ \ | |/ | | | | | | | | * PHP-5.4: typo fixes (argument) typo fixes (accommodate, parameter)
| * 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
|\ \ | |/ | | | | | | * PHP-5.4: Fixed Bug #64915 (error_log ignored when daemonize=0)
| * 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.
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-05-218-2/+189
|\ \ | |/ | | | | | | * PHP-5.4: Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
| * 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.4' into PHP-5.5Remi Collet2013-05-034-4/+12
|\ \ | |/ | | | | | | * PHP-5.4: From code coverity scan, syscall return value must be check.
| * 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.4' into PHP-5.5Remi Collet2013-05-022-1/+6
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: fix more resource leaks
| * | 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.4' into PHP-5.5Remi Collet2013-05-023-5/+27
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: 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)
| * | 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.4' into PHP-5.5Remi Collet2013-05-021-6/+6
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: fixed size array cannot 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.4' into PHP-5.5Remi Collet2013-05-021-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: use limit_extensions as we use security_limit_extensions later (free) unused variable
| * | 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
View Lorry Controller Status