summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-061-2/+0
|\ | | | | | | | | * PHP-5.5: cleanup old unused typedef
| * cleanup old unused typedefRemi Collet2015-01-061-2/+0
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2015-01-068-10/+48
|\ \ | |/ | | | | | | | | | | | | | | * PHP-5.5: Handle NULL strings in sapi_cli_server_register_variable(). Allow CLI server test scripts to specify the name of the router file. Conflicts: sapi/cli/tests/php_cli_server.inc
| * Handle NULL strings in sapi_cli_server_register_variable().Adam Harvey2015-01-062-0/+39
| | | | | | | | Fixes bug #68745 (Invalid HTTP requests make web server segfault).
| * Allow CLI server test scripts to specify the name of the router file.Adam Harvey2015-01-066-10/+9
| | | | | | | | | | This is required to write tests that behave differently when an index.php isn't present in the document root. (Such as the one I'm about to commit.)
* | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-01-051-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.5: NEWS Fix bug #68751 listen.allowed_clients is broken
| * Fix bug #68751 listen.allowed_clients is brokenRemi Collet2015-01-051-1/+1
| |
* | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-12-301-2/+5
|\ \ | |/ | | | | | | | | * PHP-5.5: FIx bug #68618 (out of bounds read crashes php-cgi) Fixed bug #68676 (Explicit Double Free)
| * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-12-301-2/+5
| |\ | | | | | | | | | | | | * PHP-5.4: FIx bug #68618 (out of bounds read crashes php-cgi)
| | * FIx bug #68618 (out of bounds read crashes php-cgi)Stanislav Malyshev2014-12-301-2/+5
| | |
| | * Revert "made lsapi_main.c compatible with PHP7/phpng ."Stanislav Malyshev2014-11-221-92/+26
| | | | | | | | | | | | | | | This reverts commit 9fb816f45ad9baa46b91514e70f755eb88539e85. Not a security-related fix.
| | * made lsapi_main.c compatible with PHP7/phpng .George Wang2014-11-201-26/+92
| | |
| | * set default response code to 200George Wang2014-11-031-2/+2
| | |
| | * Fixed a bug that causes crash when environment variable is access while ↵George Wang2014-10-031-1/+2
| | | | | | | | | | | | parsing php.ini
* | | fix typoRemi Collet2014-12-141-1/+1
| | |
* | | Fix bug #68526 Implement POSIX Access Control List for UDSRemi Collet2014-12-109-4/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | - add --with-fpm-acl build option which allow to manage ACL on Unix Domain Socket - add listen.acl_users pool option - add listen.acl_groups pool option Keep old behavior (chmod) if option not used or not supported.
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-011-3/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix possible null pointer math
| * | fix possible null pointer mathAnatol Belski2014-12-011-3/+5
| | |
| * | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
| | | | | | | | | | | | | | | | | | Add port range verification of listening port with -S option for the php cli. This fixes inconsistent listening port due to unverified cast from long to short with htons(3).
* | | Fix php cli (-S option) inconsistent port parsingnil0x422014-11-301-2/+2
| | | | | | | | | | | | | | | | | | Add port range verification of listening port with -S option for the php cli. This fixes inconsistent listening port due to unverified cast from long to short with htons(3).
* | | XFAIL as catch_workers_output = yes seems not reliableRemi Collet2014-12-013-2/+4
| | |
* | | Move chown to fpm_unix_set_socket_premissions()Remi Collet2014-11-293-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | For consistency, with fpm_unix_resolve_socket_premissions. Compute + Use in the same source file. To make easier future enhancement. Also check chdir output to fix a build warning.
* | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-11-291-5/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix test with readline on mac
| * | fix test with readline on macFerenc Kovacs2014-11-291-5/+5
| | |
| * | Fixed Bug #68478 acess_log don't use prefixRemi Collet2014-11-223-3/+6
| | | | | | | | | | | | | | | | | | Calling fpm_conf_process_all_pools before fpm_log_open allow to use fpm_evaluate_full_path and so to honor global prefix or pool prefix for access.log
| * | Fix bug #68463 listen.allowed_clients can silently result in no allowed accessRemi Collet2014-11-211-0/+4
| | | | | | | | | | | | Add a "There are no allowed addresses for this pool"
| * | Raise a warning when listen = hostname used and is resolved as multiple ↵Remi Collet2014-11-211-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addresses Using getaddrinfo is perhaps not a good idea... if we are not able to listen on multiple addresses... At least this message should help to diagnose problem, ex ... Found address for localhost, socket opened on ::1 ... Found multiple addresses for localhost, 127.0.0.1 ignored
| * | move zlog_set_level() againDavid Zuelke2014-11-212-2/+1
| | | | | | | | | | | | | | | from fpm_unix_init_main() to fpm_conf_post_process() this time (see #894), because otherwise nothing in fpm_conf_init_main() obeys log levels
| * | Change pm.start_servers default warning to noticeDavid Zuelke2014-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Unlike other settings, this has a perfectly reasonable default, calculated using a dynamic formula. If the default was hardcoded to "2" or something, then it would make sense to have a warning, since that could potentially be bad, but for a dynamically calculated value based on other mandatory settings, a notice ought to be enough.
* | | typo fixFerenc Kovacs2014-11-261-1/+1
| | |
* | | go back with phpdbg to the state of 5.6.3, reverting the controversial ↵Ferenc Kovacs2014-11-2655-8124/+2673
| | | | | | | | | | | | commits(remote debugging/xml protocol)
* | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-238-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | | minor typo in testRemi Collet2014-11-221-1/+1
| | |
* | | add test for global / pool prefix and bug #68478Remi Collet2014-11-222-0/+156
| | |
* | | Fixed Bug #68478 acess_log don't use prefixRemi Collet2014-11-223-3/+6
| | | | | | | | | | | | | | | | | | Calling fpm_conf_process_all_pools before fpm_log_open allow to use fpm_evaluate_full_path and so to honor global prefix or pool prefix for access.log
* | | add test for fastcgi_finish_request()Remi Collet2014-11-211-0/+67
| | |
* | | add test for #68391Remi Collet2014-11-211-0/+87
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-211-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: NEWS Fixed bug #68391 Returns the pool config files in order
| * | Fixed bug #68391 Returns the pool config files in orderFlorian MARGAINE2014-11-211-1/+1
| | | | | | | | | | | | Fixes https://bugs.php.net/bug.php?id=68391
| * | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5George Wang2014-11-207-46/+120
| |\ \
| * | | made lsapi_main.c compatible with PHP7/phpng .George Wang2014-11-201-26/+92
| | | |
* | | | Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6George Wang2014-11-2025-80/+1594
|\ \ \ \
| * | | | adapt test for error message introduce in fix for #68463Remi Collet2014-11-201-12/+28
| | | | |
| * | | | Fix bug #68463 listen.allowed_clients can silently result in no allowed accessRemi Collet2014-11-201-0/+4
| | | | | | | | | | | | | | | | | | | | Add a "There are no allowed addresses for this pool"
| * | | | run a few request in this testRemi Collet2014-11-201-0/+7
| | | | |
| * | | | Raise a warning when listen = hostname used and is resolved as multiple ↵Remi Collet2014-11-201-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addresses Using getaddrinfo is perhaps not a good idea... if we are not able to listen on multiple addresses... At least this message should help to diagnose problem, ex ... Found address for localhost, socket opened on ::1 ... Found multiple addresses for localhost, 127.0.0.1 ignored
| * | | | Fixed #68458 Change pm.start_servers default warning to noticeRemi Collet2014-11-201-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add another test 014 checks that no "notice" are traced when log_level=warning 015 checks that "notice" are traced when log_level=notice
| * | | | fix test descriptionDavid Zuelke2014-11-201-1/+1
| | | | |
| * | | | tests for #895David Zuelke2014-11-201-0/+54
| | | | |
| * | | | move zlog_set_level() againDavid Zuelke2014-11-202-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | from fpm_unix_init_main() to fpm_conf_post_process() this time (see #894), because otherwise nothing in fpm_conf_init_main() obeys log levels
View Lorry Controller Status