1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Commit Graph

86217 Commits

Author SHA1 Message Date
Remi Collet 146d42ae5d Merge branch 'PHP-5.6'
* PHP-5.6:
  add test for fastcgi_finish_request()
2014-11-21 11:28:42 +01:00
Remi Collet 1e14f805f9 add test for fastcgi_finish_request() 2014-11-21 11:28:20 +01:00
Anatol Belski bcd9c6b256 Merge branch 'PHP-5.6'
* PHP-5.6:
  added test for things done so far for bug #66265
  partially fixed bug #66265
  forked bug67052.phpt for Windows
2014-11-21 10:25:18 +01:00
Anatol Belski 0581e877a5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added test for things done so far for bug #66265
  partially fixed bug #66265
  forked bug67052.phpt for Windows
2014-11-21 10:24:53 +01:00
Anatol Belski f2e33dc725 added test for things done so far for bug #66265 2014-11-21 10:22:47 +01:00
Anatol Belski 56fac96bec partially fixed bug #66265
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.
2014-11-21 09:57:12 +01:00
Anatol Belski 502ce90873 forked bug67052.phpt for Windows 2014-11-21 09:53:55 +01:00
Remi Collet 178dd83814 Merge branch 'PHP-5.6'
* PHP-5.6:
  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
2014-11-21 07:57:07 +01:00
Remi Collet b97fd60b42 Merge branch 'PHP-5.5' into PHP-5.6
* 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
2014-11-21 07:56:48 +01:00
Remi Collet 8be510ae63 NEWS 2014-11-21 07:56:39 +01:00
Remi Collet 5be75da202 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-21 07:55:13 +01:00
Remi Collet c4ca220467 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-21 07:54:51 +01:00
Remi Collet 831e21a8c3 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  move zlog_set_level() again
  Change pm.start_servers default warning to notice
2014-11-21 07:50:19 +01:00
Remi Collet d10df70f4e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  move zlog_set_level() again
  Change pm.start_servers default warning to notice
2014-11-21 07:50:04 +01:00
Remi Collet 1f4972e348 NEWS 2014-11-21 07:49:53 +01:00
David Zuelke 9e8d4a1b06 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-21 07:49:08 +01:00
David Zuelke 8beb153460 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-21 07:47:04 +01:00
Remi Collet a849096c08 Merge branch 'PHP-5.6'
* PHP-5.6:
  add test for #68391
  NEWS
  NEWS
  Fixed bug #68391 Returns the pool config files in order
2014-11-21 07:37:05 +01:00
Remi Collet 5234c2941f add test for #68391 2014-11-21 07:36:34 +01:00
Remi Collet 4ab05e8f69 NEWS 2014-11-21 07:35:49 +01:00
Remi Collet 61f6cd0da5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed bug #68391 Returns the pool config files in order
2014-11-21 07:35:10 +01:00
Remi Collet cf3a902286 NEWS 2014-11-21 07:34:40 +01:00
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 9de44a29e0 Merge branch 'PHP-5.6' 2014-11-20 16:19:36 -08: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 0f9f0c0bd5 Merge branch 'master' of git.php.net:php-src 2014-11-20 16:55:22 -05:00
George Wang dce692dfa0 made lsapi_main.c compatible with PHP7/phpng .
Conflicts:
	sapi/litespeed/lsapi_main.c
2014-11-20 16:54:42 -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 8904fbc692 Merge branch 'PHP-5.6'
* 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
2014-11-20 15:17:02 +01: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 9081e8a4d2 Merge branch 'PHP-5.6'
* PHP-5.6:
  run a few request in this test
2014-11-20 14:45:35 +01:00
Remi Collet 7ef559ff80 run a few request in this test 2014-11-20 14:45:17 +01:00
Anatol Belski 9a91e5019d fix test 2014-11-20 14:37:17 +01:00
Anatol Belski 00c856250f fix test 2014-11-20 14:35:04 +01:00
Anatol Belski 583c3dc9e7 added info about some other macro changes 2014-11-20 14:23:15 +01:00
Anatol Belski f030cd8bda added note about toolset and phpize 2014-11-20 14:23:14 +01:00
Anatol Belski 799057c6be added note about the response files 2014-11-20 14:23:13 +01:00
Anatol Belski 548fe5617c Merge branch 'PHP-5.6'
* PHP-5.6:
  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
2014-11-20 13:37:13 +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