Commit Graph

80941 Commits

Author SHA1 Message Date
Florian MARGAINE
29d2c13809 Fixed bug #68391 Returns the pool config files in order
Fixes https://bugs.php.net/bug.php?id=68391
2014-11-21 07:33:15 +01:00
Adam Harvey
245d01892a Merge branch 'PHP-5.5' into PHP-5.6 2014-11-20 16:19:03 -08:00
Adam Harvey
73cb5ca777 Merge branch 'PHP-5.4' into PHP-5.5 2014-11-20 16:18:42 -08:00
George Wang
b664909397 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-11-20 16:56:28 -05:00
George Wang
d467761663 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2014-11-20 16:56:03 -05:00
George Wang
620db04e91 made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:50:15 -05:00
George Wang
bd3bc097b0 made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:49:56 -05:00
George Wang
9fb816f45a made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:49:01 -05:00
Remi Collet
15d8601866 NEWS 2014-11-20 15:16:39 +01:00
Remi Collet
6e1e113b91 adapt test for error message introduce in fix for #68463 2014-11-20 15:15:54 +01:00
Remi Collet
5c6ccb2d8f Fix bug #68463 listen.allowed_clients can silently result in no allowed access
Add a "There are no allowed addresses for this pool"
2014-11-20 15:14:34 +01:00
Remi Collet
7ef559ff80 run a few request in this test 2014-11-20 14:45:17 +01:00
Anatol Belski
e25b23d1c9 Merge branch 'PHP-5.5' into PHP-5.6
* 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
2014-11-20 13:36:37 +01:00
Anatol Belski
6c3768b154 split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1 2014-11-20 13:26:23 +01:00
Anatol Belski
65ca28b463 split formatter_format*.phpt for ICP 54.1 2014-11-20 13:17:41 +01:00
Anatol Belski
2ec7f04f7e split dateformat_timezone_arg_variations*.phpt for ICU 54.1 2014-11-20 13:12:02 +01:00
Anatol Belski
a52ff5cde6 split dateformat_get_set_timezone_variant*.phpt for ICU 54.1 2014-11-20 13:06:22 +01:00
Anatol Belski
36a2e235dd fix icu version to test 2014-11-20 13:01:04 +01:00
Anatol Belski
96249b68e5 split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1 2014-11-20 12:58:41 +01:00
Anatol Belski
278d71e508 split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1 2014-11-20 12:53:11 +01:00
Anatol Belski
9cfe459e21 split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1 2014-11-20 12:46:48 +01:00
Anatol Belski
54af278762 split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1 2014-11-20 12:39:52 +01:00
Anatol Belski
b61dba5e1d clone dateformat_calendars_variant3.phpt for ICU 54.1 2014-11-20 11:49:39 +01:00
Anatol Belski
8ca69ff641 split collator_get_sort_key_variant3.phpt for icu 54.1 2014-11-20 11:37:06 +01:00
Anatol Belski
f97fc096a3 split ext/intl/tests/collator_create3.phpt for icu >= 54.1 2014-11-20 11:17:42 +01:00
Remi Collet
9fd54bd9d8 Raise a warning when listen = hostname used and is resolved as multiple 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
2014-11-20 10:15:15 +01:00
Remi Collet
914787491d NEWS 2014-11-20 08:15:13 +01:00
Remi Collet
1939097ede Fixed #68458 Change pm.start_servers default warning to notice
Add another test
014 checks that no "notice" are traced when log_level=warning
015 checks that "notice" are traced when log_level=notice
2014-11-20 08:12:27 +01:00
David Zuelke
a128cbad57 fix test description 2014-11-20 08:11:44 +01:00
David Zuelke
49be4af42b tests for #895 2014-11-20 08:11:44 +01:00
David Zuelke
befce20c84 move zlog_set_level() again
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
2014-11-20 08:11:43 +01:00
David Zuelke
909d44f20d Change pm.start_servers default warning to notice
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.
2014-11-20 08:11:43 +01:00
Remi Collet
7e0ccb6d12 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
2014-11-20 07:49:54 +01:00
Peter Cowburn
48c0cf7df6 NEWS 2014-11-19 17:03:15 +00:00
Chris McCafferty
1e92b24a2a Fix #68355: Inconsistency in example php.ini comments
There are some arbitrary differences between php.ini-production and
php.ini-development. This patch corrects the differences.
2014-11-19 16:57:47 +00:00
Remi Collet
a521d7e1be NEWS 2014-11-19 16:49:23 +01:00
Remi Collet
c5a1c5f5a4 Fixed bug #68452 php-fpm man page is oudated (-O) 2014-11-19 16:49:05 +01:00
Remi Collet
4a36482378 Merge branch 'PHP-5.5' into PHP-5.6
* 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
2014-11-19 16:48:21 +01:00
Remi Collet
d438bcf226 NEWS 2014-11-19 16:47:52 +01:00
Remi Collet
858c9d86fa Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z) 2014-11-19 16:46:51 +01:00
Remi Collet
c40e665ecd NEWS 2014-11-18 17:45:50 +01:00
Remi Collet
f164df0b7b add test for bug #68381 2014-11-18 17:45:50 +01:00
David Zuelke
9a43410871 Fixed bug #68381 Set FPM log level earlier during init
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+
2014-11-18 17:45:49 +01:00
Remi Collet
5674827ead NEWS 2014-11-18 17:43:28 +01:00
David Zuelke
03cf70ab1e Fixed bug #68381 Set FPM log level earlier during init
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+
2014-11-18 17:42:21 +01:00
Remi Collet
ec26d7a80f simplify fpm tests 2014-11-18 13:11:53 +01:00
Remi Collet
51394dff3f Add test for bug #68442
Add another helper function fpm_display_log

Restore change from c996a989 badly reverted in 8c0cc49
2014-11-18 11:08:49 +01:00
Remi Collet
8c0cc49b9b Add various tests for FPM
- covering recent bugs (68420, 68421, 68423, 68428)
- for UDS
- for ping and status URI
- for multi pool and multi mode
2014-11-18 08:07:45 +01:00
Remi Collet
a740f9e783 Include small MIT FastCGI client library from
https://github.com/adoy/PHP-FastCGI-Client

Add run_request function to easily run a FastCGI call,
which is needed for new tests.
2014-11-18 08:01:18 +01:00
Remi Collet
d8868b654e Add new FPM test for IPv4/IPv6
Use 9000+PHP_INT_SIZE as poprt
- to avoid using default 9000
- to allow multipole 32/64 bits simultaneous run
2014-11-17 15:22:04 +01:00