com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_alloc.c ext/mysqlnd/mysqlnd.h ext/opcache/Z endAccelerator.c
| From: | Anatol Belski | Date: | Thu, 20 Nov 2014 14:20:18 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_alloc.c ext/mysqlnd/mysqlnd.h ext/opcache/Z endAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83340@lists.php.net to get a copy of this message | ||
Commit: 4f3ac2cdbedf7a84d64bfee7405f0c023641a806
Author: Anatol Belski <ab@php.net> Thu, 20 Nov 2014 15:20:18 +0100
Parents: 14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e 8904fbc6929aaf623d88127f876fa739c9ec627b
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4f3ac2cdbedf7a84d64bfee7405f0c023641a806
Log:
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
...
Bugs:
https://bugs.php.net/68463
Changed paths:
MM Zend/zend_alloc.c
MM ext/mysqlnd/mysqlnd.h
MM ext/opcache/ZendAccelerator.c
Diff: