com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS
| From: | Nikita Popov | Date: | Sat, 14 Mar 2015 08:18:31 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85515@lists.php.net to get a copy of this message | ||
Commit: 846c8059e60b1c5ac918b2036c15b490971eb6e3
Author: Nikita Popov <nikic@php.net> Sat, 14 Mar 2015 09:18:03 +0100
Parents: 96bb3b838c5cbeafa1328c65fbe33be1c340572b 1e51c5411e2d1bdcddb6731a502ce429605c1d08
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=846c8059e60b1c5ac918b2036c15b490971eb6e3
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Changed paths:
MM NEWS
Diff:
diff --cc NEWS
index f79a95f,46a1102..a1efcfe
--- a/NEWS
+++ b/NEWS
@@@ -12,16 -14,14 +12,18 @@@
with an Iterator). (Nikita)
- Filter:
- . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other
+ . Fixed bug #69202: (FILTER_FLAG_STRIP_BACKTICK ignored unless other
flags are used). (Jeff Welch)
+ . Fixed bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127). (Jeff
+ Welch)
-- Mbstring:
- . Fixed bug #68846 (False detection of CJK Unified Ideographs Extension E).
- (Masaki Kagaya)
+- OpenSSL
+ . Fixed bugs #68853, #65137 (Buffered crypto stream data breaks IO polling
+ in stream_select() contexts) (Chris Wright)
+ . Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
+ (Daniel Lowrey)
+ . Fixed bug #69215 (Crypto servers should send client CA list)
+ (Daniel Lowrey)
- SPL:
. Fixed #69227 (Use after free in zval_scan caused by