From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 29 Dec 2016 12:49:29 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4d884dc6e85126c7360e8bb99a9eb64831d6672;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "Fix #73530: Unsetting result set may reset other result set"
---

f4d884dc6e85126c7360e8bb99a9eb64831d6672
diff --cc NEWS
index cfe066b639,90c68e23bd..05492132b9
--- a/NEWS
+++ b/NEWS
@@@ -40,11 -25,23 +40,15 @@@ PH
    . Fixed bug #72931 (PDO_FIREBIRD with Firebird 3.0 not work on returning
      statement). (Dorin Marcoci)
  
 -- Streams:
 -  . Fixed bug #73586 (php_user_filter::$stream is not set to the stream the
 -    filter is working on). (Dmitry)
 -
 -- Phpdbg:
 -  . Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup).
 -    (Bob)
 -  . Fixed issue getting executable lines from custom wrappers. (Bob)
 +- phpdbg:
 +  . Fixed bug #73794 (Crash (out of memory) when using run and # command
 +    separator). (Bob)
    . Fixed bug #73704 (phpdbg shows the wrong line in files with shebang). (Bob)
  
 -- Reflection:
 -  . Fixed bug #46103 (ReflectionObject memory leak). (Nikita)
 -
+ - SQLite3:
+   . Reverted fix for bug #73530	(Unsetting result set may reset other result
+     set). (cmb)
+ 
  - Standard:
    . Fixed bug #73594 (dns_get_record does not populate $additional out parameter).
      (Bruce Weirdan)