summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | partially fixed bug #66265Anatol Belski2014-11-211-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NTS mode should additionally use _putenv to satisfy libs like gettext relying on _getenv. As _putenv isn't thread safe, it wouldn't bring much for the TS mode as it would change locale across all the threads and require locking to avoid random fails with concurrent _getenv calls.
| * | | | | | | forked bug67052.phpt for WindowsAnatol Belski2014-11-212-0/+35
| | | | | | | |
* | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS Fix bug #68463 listen.allowed_clients can silently result in no allowed access Raise a warning when listen = hostname used and is resolved as multiple addresses
| * | | | | | | NEWSRemi Collet2014-11-211-0/+2
| | | | | | | |
| * | | | | | | 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
* | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-11-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS move zlog_set_level() again Change pm.start_servers default warning to notice
| * | | | | | | NEWSRemi Collet2014-11-211-0/+2
| | | | | | | |
| * | | | | | | 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.
* | | | | | | | add test for #68391Remi Collet2014-11-211-0/+87
| | | | | | | |
* | | | | | | | NEWSRemi Collet2014-11-211-1/+3
| | | | | | | |
* | | | | | | | 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
| * | | | | | | NEWSRemi Collet2014-11-211-0/+2
| | | | | | | |
| * | | | | | | 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' into PHP-5.6Adam Harvey2014-11-200-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-11-200-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | made lsapi_main.c compatible with PHP7/phpng .George Wang2014-11-201-26/+92
| | | | | | | |
| * | | | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5George Wang2014-11-2051-825/+2092
| |\ \ \ \ \ \ \
| * | | | | | | | 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-2070-954/+3336
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NEWSRemi Collet2014-11-201-0/+2
| | | | | | | | | |
| * | | | | | | | | 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
| | | | | | | | | |
| * | | | | | | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-11-2022-3/+685
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: 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 split ext/intl/tests/collator_create3.phpt for icu >= 54.1 Conflicts: ext/intl/tests/dateformat_create_cal_arg_variant3.phpt ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt ext/intl/tests/dateformat_get_set_calendar_variant3.phpt ext/intl/tests/dateformat_get_set_timezone_variant3.phpt ext/intl/tests/dateformat_timezone_arg_variations3.phpt ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt
| | * | | | | | | | split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1Anatol Belski2014-11-203-1/+62
| | | | | | | | | |
| | * | | | | | | | split formatter_format*.phpt for ICP 54.1Anatol Belski2014-11-202-1/+132
| | | | | | | | | |
| | * | | | | | | | split dateformat_timezone_arg_variations*.phpt for ICU 54.1Anatol Belski2014-11-203-1/+93
| | | | | | | | | |
| | * | | | | | | | split dateformat_get_set_timezone_variant*.phpt for ICU 54.1Anatol Belski2014-11-203-1/+126
| | | | | | | | | |
| | * | | | | | | | fix icu version to testAnatol Belski2014-11-201-1/+1
| | | | | | | | | |
| | * | | | | | | | split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1Anatol Belski2014-11-203-1/+112
| | | | | | | | | |
| | * | | | | | | | split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1Anatol Belski2014-11-203-1/+68
| | | | | | | | | |
| | * | | | | | | | split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1Anatol Belski2014-11-203-1/+82
| | | | | | | | | |
| | * | | | | | | | split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1Anatol Belski2014-11-203-1/+108
| | | | | | | | | |
| | * | | | | | | | clone dateformat_calendars_variant3.phpt for ICU 54.1Anatol Belski2014-11-202-0/+46
| | | | | | | | | |
| | * | | | | | | | split collator_get_sort_key_variant3.phpt for icu 54.1Anatol Belski2014-11-202-1/+100
| | | | | | | | | |
| | * | | | | | | | split ext/intl/tests/collator_create3.phpt for icu >= 54.1Anatol Belski2014-11-202-1/+81
| | | | | | | | | |
| * | | | | | | | | 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
| * | | | | | | | | NEWSRemi Collet2014-11-201-0/+2
| | | | | | | | | |
| * | | | | | | | | 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
| * | | | | | | | | NEWSPeter Cowburn2014-11-191-0/+2
| | | | | | | | | |
| * | | | | | | | | Fix #68355: Inconsistency in example php.ini commentsChris McCafferty2014-11-192-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some arbitrary differences between php.ini-production and php.ini-development. This patch corrects the differences.
| * | | | | | | | | NEWSRemi Collet2014-11-191-0/+1
| | | | | | | | | |
| * | | | | | | | | Fixed bug #68452 php-fpm man page is oudated (-O)Remi Collet2014-11-191-0/+7
| | | | | | | | | |