From: Nikita Popov <nikic@php.net>
Date: Sat, 14 Mar 2015 08:18:03 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=846c8059e60b1c5ac918b2036c15b490971eb6e3;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

846c8059e60b1c5ac918b2036c15b490971eb6e3
diff --cc NEWS
index f79a95f336,46a1102c25..a1efcfe23c
--- 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