summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2014-09-271-2/+0
|\
| * This test should passJohannes Schlüter2014-09-271-2/+0
| |
| * Fine tuned the order of adding request variables.George Wang2014-09-081-1/+2
| |
| * Update LSAPI to 6.7, added support for 'filter_input'.George Wang2014-09-032-7/+67
| | | | | | | | Fixed a crash in CLI mode.
* | Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when ↵Remi Collet2014-09-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using Apache ProxyPass is unable to provide correct PATH_INFO as it is not aware of file path (while SetHandler is). As we can extract PATH_INFO from PATH_TRANSLATED, we also need to check if present in SCRIPT_NAME and remove it. After applying this patch. With mod_php _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foor/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1 With mod_proxy_fcgi + SetHandler _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foo/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1 With mod_proxy_fcgi + ProxyPass _SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 _SERVER["SCRIPT_NAME"] /info.php _SERVER["PATH_INFO"] /foo/bar _SERVER["PHP_SELF"] /info.php/foo/bar _SERVER["QUERY_STRING"] q=1
* | fixed the cast and incompatible pointer warningAnatol Belski2014-09-121-2/+2
| |
* | Fine tuned the order of adding request variables.George Wang2014-09-091-1/+2
| |
* | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5George Wang2014-09-038-33/+75
|\ \
| * \ Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-08-281-3/+8
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.4: fix NEWS for fcgi fix merge restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
| | * restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes ↵David Zuelke2014-08-281-3/+8
| | | | | | | | | | | | bug 67606
| * | Fix bug #67878 program_prefix not honoured in man pagesRemi Collet2014-08-211-18/+18
| | | | | | | | | | | | | | | | | | - add @program_prefix@ in php, phpize and php-config man pages - set date to 2014 - fix "SEE ALSO" alignment
| * | Merge branch 'PHP-5.4' into PHP-5.5Michael Wallner2014-07-303-6/+10
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fixed bug #67715 (php-milter does not build and crashes randomly).
| | * Fixed bug #67715 (php-milter does not build and crashes randomly).Michael Wallner2014-07-303-6/+10
| | |
| | * Fixed a bug that cannot access custom request header stored in ↵George Wang2014-07-111-0/+1
| | | | | | | | | | | | apache_request_headers() though array index.
| | * cleanup file headers.George Wang2014-07-102-16/+0
| | |
| | * Do not kill children process in pre-fork mode when parent process quit.George Wang2014-07-101-2/+2
| | |
| | * update to LSAPI 6.6George Wang2014-07-102-10/+36
| | | | | | | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c
| | * Update LiteSpeed SAPI code to V6.4George Wang2014-07-104-669/+2007
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c sapi/litespeed/lsapidef.h sapi/litespeed/lsapilib.c sapi/litespeed/lsapilib.h
| | * Fixed typo in Makefile.fragGeorge Wang2014-07-101-1/+1
| | |
| * | See bug #67635Remi Collet2014-07-201-2/+14
| | | | | | | | | | | | | | | | | | | | | Improve previous fix: - also rely on pkg-config for systemd < 209 - always check for header - comments
| * | improve previous, add message during configureRemi Collet2014-07-191-0/+3
| | |
| * | Fixed bug #67635 php links to systemd libraries without using pkg-configRemi Collet2014-07-191-3/+15
| | | | | | | | | | | | | | | | | | | | | Patch from pacho at gentoo dot org Rely on pkg-config for systemd >= 209 Failback on old check
| * | This test depends on expose_php being onRasmus Lerdorf2014-07-141-0/+2
| | |
| * | Fix #67594 - invisible colon should be stripped off header nameTjerk Meesters2014-07-121-4/+8
| | |
* | | Update LSAPI to 6.7, added support for 'filter_input'.George Wang2014-09-032-7/+67
|/ / | | | | | | Fixed a crash in CLI mode.
* | Fixed a bug that cannot access custom request header stored in ↵George Wang2014-07-111-0/+1
| | | | | | | | apache_request_headers() though array index.
* | cleanup file headers.George Wang2014-07-102-16/+0
| |
* | Do not kill children process in pre-fork mode when parent process quit.George Wang2014-07-101-2/+2
| |
* | update to LSAPI 6.6George Wang2014-07-102-10/+36
| | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c
* | Update LiteSpeed SAPI code to V6.4George Wang2014-07-104-1172/+2755
| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c sapi/litespeed/lsapidef.h sapi/litespeed/lsapilib.c sapi/litespeed/lsapilib.h Conflicts: sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c sapi/litespeed/lsapilib.h
* | Fixed typo in Makefile.fragGeorge Wang2014-07-101-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-07-081-0/+4
|\ \ | |/ | | | | | | | | * PHP-5.4: NEWS Fix Bug #67530 error_log=syslog ignored
| * Fix Bug #67530 error_log=syslog ignoredRemi Collet2014-07-081-0/+4
| | | | | | | | | | As for Bug #64915 Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-07-072-4/+46
|\ \ | |/ | | | | | | * PHP-5.4: Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
| * Fixed bug #66830 (Empty header causes PHP built-in web server to hang).Adam Harvey2014-07-072-4/+46
| | | | | | | | | | | | | | | | We had an infinite loop in sapi_cli_server_send_headers(): while iterating over the linked list of headers, when an empty header was hit, continue would go to the next iteration of the loop without updating h to be the next value in the linked list. Updating it to always increment regardless of whether the header is actually valid or not fixes the issue.
* | Merge branch 'PHP-5.4' into PHP-5.5Ferenc Kovacs2014-06-301-4/+0
|\ \ | |/ | | | | | | | | * PHP-5.4: remove the NEWS entry for the reverted fpm fix Revert "Fix Bug #67530 error_log=syslog ignored"
| * Revert "Fix Bug #67530 error_log=syslog ignored"Ferenc Kovacs2014-06-301-4/+0
| | | | | | | | This reverts commit a0ecb3794f00e65cd2a073b2073e32d6c2fb7180.
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-272-0/+7
|\ \ | |/ | | | | | | | | | | * PHP-5.4: NEWS Fix Bug #67531 syslog cannot be set in pool configuration Fix Bug #67530 error_log=syslog ignored
| * Fix Bug #67531 syslog cannot be set in pool configurationRemi Collet2014-06-271-0/+3
| | | | | | | | | | error_log is listed in FPM_PHP_INI_TO_EXPAND, but should not be expand when value = syslog
| * Fix Bug #67530 error_log=syslog ignoredRemi Collet2014-06-271-0/+4
| | | | | | | | | | As for Bug #64915 Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
* | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-06-181-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.4: Update copyright year to 2014 Update copyright year to 2014
| * Update copyright year to 2014Lior Kaplan2014-06-171-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-06-122-0/+51
|\ \ | |/ | | | | | | * PHP-5.4: Add 308 and 426 to the HTTP response code map in the CLI server.
| * Add 308 and 426 to the HTTP response code map in the CLI server.Adam Harvey2014-06-122-0/+51
| | | | | | | | Implements FR #67429 (CLI server is missing some new HTTP response codes).
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-101-3/+3
|\ \ | |/ | | | | | | | | * PHP-5.4: NEWS Fixed bug #67406 built-in web-server segfaults on startup
| * Fixed bug #67406 built-in web-server segfaults on startupRemi Collet2014-06-101-3/+3
| | | | | | | | | | | | | | | | Reproduce on aarch64. From select man page: "select() may update the timeout argument to indicate how much time was left." So "const" is not ok.
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-292-3/+3
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #67060: use default mode of 660
| * Fix bug #67060: use default mode of 660Stanislav Malyshev2014-04-292-3/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-201-1/+5
|\ \ | |/ | | | | | | * PHP-5.4: Fix #66908: php-fpm reload leaks epoll_create() file descriptor
| * Fix #66908: php-fpm reload leaks epoll_create() file descriptorJulio Pintos2014-04-201-1/+5
| | | | | | | | This patch fixes descriptor leak which could lead to DoS once Max open files is reached
View Lorry Controller Status