From: Anatol Belski <ab@php.net>
Date: Thu, 20 Nov 2014 14:20:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into native-tls
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f3ac2cdbedf7a84d64bfee7405f0c023641a806;p=php

Merge remote-tracking branch 'origin/master' into native-tls

* 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
  ...
---

4f3ac2cdbedf7a84d64bfee7405f0c023641a806