summaryrefslogtreecommitdiff
path: root/sapi
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | 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
| * | | | fix phpdbg, _zend_execute_data.scope was removed with ↵Ferenc Kovacs2014-11-281-2/+2
| | | | | | | | | | | | | | | | | | | | 9a36cb1a07c247766278a888612ecbac812bece9
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-2617-56/+423
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (102 commits) fix dir separator in test fix TS build fix TS build Better fix for bug #68446 Revert "Merge remote-tracking branch 'origin/PHP-5.6'" Revert NEWS and set test to XFAIL Revert "Fix bug #68446 (bug with constant defaults and type hints)" Improved zend_hash_clean() and added new optimized zend_symtable_clean() Use inline version of zval_ptr_dtor() Added new optimized zend_array_destroy() function Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h fix REGISTER_NS_*_CONSTANT macros Removed useless assert. EG(uninitialized_zval) can't be refcounted. Use specialized destructors when types of zvals are known. move tests into proper place Improved assignment to object property Reuse zend_assign_to_variable() in zend_std_write_property() cleanup comments from svn/cvs era fix dir separator in test fork test for windows ...
| * | | | FPM: change "listen = port" behavior from IPv4 catch-all to IPv6 catch-all ↵Remi Collet2014-11-242-17/+5
| | | | | | | | | | | | | | | | | | | | (+ IPv4-mapped)
| * | | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-238-10/+10
| | | | |
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-11-226-4/+163
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: NEWS minor typo in test add test for global / pool prefix and bug #68478 Fixed Bug #68478 acess_log don't use prefix
| | * | | 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
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-11-211-0/+67
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * PHP-5.6: add test for fastcgi_finish_request()
| | * | | add test for fastcgi_finish_request()Remi Collet2014-11-211-0/+67
| | | | |
| * | | | Merge branch 'PHP-5.6'Remi Collet2014-11-212-1/+88
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: add test for #68391 NEWS NEWS Fixed bug #68391 Returns the pool config files in order
| | * | | 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
| | |\ \ \ \
| | * | | | | made lsapi_main.c compatible with PHP7/phpng .George Wang2014-11-201-26/+92
| | | | | | |
| * | | | | | Merge branch 'master' of git.php.net:php-srcGeorge Wang2014-11-2030-91/+1618
| |\ \ \ \ \ \
| * | | | | | | made lsapi_main.c compatible with PHP7/phpng .George Wang2014-11-201-25/+91
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sapi/litespeed/lsapi_main.c
* | | | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-207-19/+184
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (36 commits) NEWS adapt test for error message introduce in fix for #68463 Fix bug #68463 listen.allowed_clients can silently result in no allowed access run a few request in this test fix test fix test added info about some other macro changes added note about toolset and phpize added note about the response files split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1 split formatter_format*.phpt for ICP 54.1 split dateformat_timezone_arg_variations*.phpt for ICU 54.1 split dateformat_get_set_timezone_variant*.phpt for ICU 54.1 fix icu version to test split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1 split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1 split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1 split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1 clone dateformat_calendars_variant3.phpt for ICU 54.1 split collator_get_sort_key_variant3.phpt for icu 54.1 ...
| * | | | | | Merge branch 'PHP-5.6'Remi Collet2014-11-202-12/+32
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: NEWS adapt test for error message introduce in fix for #68463 Fix bug #68463 listen.allowed_clients can silently result in no allowed access
| | * | | | | 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"
| * | | | | | Merge branch 'PHP-5.6'Remi Collet2014-11-201-0/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: run a few request in this test
| | * | | | | run a few request in this testRemi Collet2014-11-201-0/+7
| | | | | | |
| * | | | | | Merge branch 'PHP-5.6'Remi Collet2014-11-201-4/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Raise a warning when listen = hostname used and is resolved as multiple addresses NEWS Fixed #68458 Change pm.start_servers default warning to notice fix test description tests for #895 move zlog_set_level() again Change pm.start_servers default warning to notice
| | * | | | | 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.
| * | | | | | 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.
| * | | | | | Merge branch 'PHP-5.6'Remi Collet2014-11-201-12/+28
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Factorization and consistency - create a fpm_use_error_log() to check when file or stderr should be used - use it everywhere for consistency - add some comments
| | * | | | | 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
* | | | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-191-4/+17
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: NEWS Fix #68355: Inconsistency in example php.ini comments NEWS Fixed bug #68452 php-fpm man page is oudated (-O) NEWS Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z) NEWS Fixed bug #68381 Set FPM log level earlier during init
| * | | | | | Merge branch 'PHP-5.6'Remi Collet2014-11-191-4/+17
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: NEWS Fixed bug #68452 php-fpm man page is oudated (-O) 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 (-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
| | | | | | |
View Lorry Controller Status