From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 26 Jan 2015 21:51:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.6RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=666cb333f725794892df7876889472aeee8e33fe;p=php

Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

Conflicts:
	NEWS
---

666cb333f725794892df7876889472aeee8e33fe
diff --cc NEWS
index cec955c572,a9ddf575d5..3708a73561
--- a/NEWS
+++ b/NEWS
@@@ -34,7 -31,10 +34,10 @@@
    . Fixed bug #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
      has rounding errors) (Keyur Govande)
  
+ - Streams:
+   . Fixed bug which caused call after final close on streams filter. (Bob)
+ 
 -22 Jan 2015, PHP 5.5.21
 +22 Jan 2015, PHP 5.6.5
  
  - Core:
    . Upgraded crypt_blowfish to version 1.3. (Leigh)