summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Change pm.start_servers default warning to noticeDavid Zuelke2014-11-201-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.
| * | | Factorization and consistencyRemi Collet2014-11-201-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | - create a fpm_use_error_log() to check when file or stderr should be used - use it everywhere for consistency - add some comments
| * | | Fixed bug #68452 php-fpm man page is oudated (-O)Remi Collet2014-11-191-0/+7
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-191-4/+10
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z) NEWS Fixed bug #68381 Set FPM log level earlier during init
| | * | Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)Remi Collet2014-11-191-4/+10
| | | |
| | * | Fixed bug #68381 Set FPM log level earlier during initDavid Zuelke2014-11-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The log level will be ignored throughout log events in fpm_unix_init_main, until the very end when zlog_set_level is finally called. In particular, fpm_unix_conf_wp may throw notices like this: > [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when… Which will still appear even if log_level in php-fpm.conf is set to warning+
| | * | update fpm configuration for #68428Remi Collet2014-11-171-1/+1
| | | |
| * | | add test for bug #68381Remi Collet2014-11-181-0/+54
| | | |
| * | | Fixed bug #68381 Set FPM log level earlier during initDavid Zuelke2014-11-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The log level will be ignored throughout log events in fpm_unix_init_main, until the very end when zlog_set_level is finally called. In particular, fpm_unix_conf_wp may throw notices like this: > [08-Nov-2014 17:13:36] NOTICE: [pool www] 'user' directive is ignored when… Which will still appear even if log_level in php-fpm.conf is set to warning+
| * | | simplify fpm testsRemi Collet2014-11-1810-32/+16
| | | |
| * | | Add test for bug #68442Remi Collet2014-11-184-4/+95
| | | | | | | | | | | | | | | | | | | | | | | | Add another helper function fpm_display_log Restore change from c996a989 badly reverted in 8c0cc49
| * | | Add various tests for FPMRemi Collet2014-11-189-6/+467
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
| * | | Include small MIT FastCGI client library fromRemi Collet2014-11-182-1/+615
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/adoy/PHP-FastCGI-Client Add run_request function to easily run a FastCGI call, which is needed for new tests.
| * | | Add new FPM test for IPv4/IPv6Remi Collet2014-11-173-4/+68
| | | | | | | | | | | | | | | | | | | | | | | | Use 9000+PHP_INT_SIZE as poprt - to avoid using default 9000 - to allow multipole 32/64 bits simultaneous run
| * | | update fpm configuration for #68428Remi Collet2014-11-171-1/+1
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-171-22/+50
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: NEWS Fixed bug #68428 allowed_client is IPv4 only
| | * | Fixed bug #68428 allowed_client is IPv4 onlyRemi Collet2014-11-171-22/+50
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-172-6/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: comment about ipv4-mapped in fpm conf Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
| | * | comment about ipv4-mapped in fpm confRemi Collet2014-11-171-2/+2
| | | |
| | * | Improve fix bug #68421 access.format='%R' doesn't log ipv6 addressRemi Collet2014-11-171-4/+14
| | | | | | | | | | | | | | | | Log IPv4-Mapped-Ipv6 address as IPv4 (not as IPv6)
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-161-2/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: improve comments about FPM listen option
| | * | improve comments about FPM listen optionRemi Collet2014-11-161-2/+4
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-151-7/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addresses
| | * | Fixed Bug #68420 listen=9000 listens to ipv6 localhost instead of all addressesRemi Collet2014-11-151-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore default behavior when no address configured: Listen on all IPv4 addresses. At some time we could consider to switch to all IPv6 but this will be a BC break.
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-143-4/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fix bug #68421 access.format='%R' doesn't log ipv6 address
| | * | Fix bug #68421 access.format='%R' doesn't log ipv6 addressRemi Collet2014-11-143-4/+10
| | | |
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-141-3/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fix bug #68423i PHP-FPM will no longer load all pools
| | * | Fix bug #68423i PHP-FPM will no longer load all poolsRemi Collet2014-11-141-3/+14
| | |/ | | | | | | | | | | | | | | | The hash need to be unique per IP + Port Previous version have (IPv4 only) sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
| | * set default response code to 200George Wang2014-11-031-2/+2
| | |
View Lorry Controller Status