From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 28 Nov 2016 09:57:02 +0000 (+0300)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cabcf8971f849ed72562916f7c113608568650c6;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
---

cabcf8971f849ed72562916f7c113608568650c6
diff --cc NEWS
index 1e43c0e976,79ced5e62b..5783463720
--- a/NEWS
+++ b/NEWS
@@@ -50,10 -69,9 +50,14 @@@ PH
    . Fixed bug #73530 (Unsetting result set may reset other result set). (cmb)
  
  - Standard:
 -   . Fixed bug #73297 (HTTP stream wrapper should ignore HTTP 100 Continue).
 -     (rowan dot collins at gmail dot com)
 +  . Fixed bug #73297 (HTTP stream wrapper should ignore HTTP 100 Continue).
 +    (rowan dot collins at gmail dot com)
 +  . Fixed bug #73303 (Scope not inherited by eval in assert()). (nikic)
 +
++- Streams:
++  . Fixed bug #73586 (php_user_filter::$stream is not set to the stream the
++    filter is working on). (Dmitry)
+ 
  - XML:
    . Fixed bug #72135 (malformed XML causes fault) (edgarsandi)