Merge branch 'PHP-5.6' into PHP-7.0

Author: cmb69

NEWS

@@ -30,6 +30,9 @@ PHP                                                                        NEWS
 - SPL:
   . Fixed bug #73423 (Reproducible crash with GDB backtrace). (Laruence)
 
+- SQLite3:
+  . Fixed bug #73530 (Unsetting result set may reset other result set). (cmb)
+
 - XML:
   . Fixed bug #72135 (malformed XML causes fault) (edgarsandi)
 

ext/sqlite3/sqlite3.c

@@ -2167,9 +2167,6 @@ static void php_sqlite3_result_object_free_storage(zend_object *object) /* {{{ *
 	}
 
 	if (!Z_ISNULL(intern->stmt_obj_zval)) {
-		if (intern->stmt_obj && intern->stmt_obj->initialised) {
-			sqlite3_reset(intern->stmt_obj->stmt);
-		}
 
 		zval_ptr_dtor(&intern->stmt_obj_zval);
 	}

ext/sqlite3/tests/bug73530.phpt

@@ -0,0 +1,32 @@
+--TEST--
+Bug #73530 (Unsetting result set may reset other result set)
+--SKIPIF--
+<?php
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available');
+?>
+--FILE--
+<?php
+$db = new SQLite3(':memory:');
+$db->exec("CREATE TABLE foo (num int)");
+$db->exec("INSERT INTO foo VALUES (0)");
+$db->exec("INSERT INTO foo VALUES (1)");
+$stmt = $db->prepare("SELECT * FROM foo WHERE NUM = ?");
+$stmt->bindValue(1, 0, SQLITE3_INTEGER);
+$res1 = $stmt->execute();
+$res1->finalize();
+$stmt->clear();
+$stmt->reset();
+$stmt->bindValue(1, 1, SQLITE3_INTEGER);
+$res2 = $stmt->execute();
+while ($row = $res2->fetchArray(SQLITE3_ASSOC)) {
+    var_dump($row);
+    unset($res1);
+}
+?>
+===DONE===
+--EXPECT--
+array(1) {
+  ["num"]=>
+  int(1)
+}
+===DONE===