Merge branch 'PHP-7.0' into PHP-7.1

cmb69 · cmb69 · commit f4d884dc6e85 · 2016-12-29T13:54:11.000+01:00
* PHP-7.0:
  Revert "Fix #73530: Unsetting result set may reset other result set"
diff --git a/NEWS b/NEWS
@@ -45,6 +45,10 @@ PHP                                                                        NEWS
     separator). (Bob)
   . Fixed bug #73704 (phpdbg shows the wrong line in files with shebang). (Bob)
 
+- 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)
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
@@ -2145,6 +2145,9 @@ 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2145,6 +2145,9 @@ static void php_sqlite3_result_object_free_storage(zend_object object) / {{{ *`
`2145`	`2145`	`}`
`2146`	`2146`
`2147`	`2147`	`if (!Z_ISNULL(intern->stmt_obj_zval)) {`
	`2148`	`+ if (intern->stmt_obj && intern->stmt_obj->initialised) {`
	`2149`	`+ sqlite3_reset(intern->stmt_obj->stmt);`
	`2150`	`+ }`
`2148`	`2151`
`2149`	`2152`	`zval_ptr_dtor(&intern->stmt_obj_zval);`
`2150`	`2153`	`}`