Merge branch 'PHP-5.6' into PHP-7.0

cmb69 · cmb69 · commit 88d1a2c5aab4 · 2016-12-29T13:47:28.000+01:00
* PHP-5.6:
  Revert "Fix #73530: Unsetting result set may reset other result set"

# Conflicts:
#	ext/sqlite3/sqlite3.c
diff --git a/NEWS b/NEWS
@@ -38,6 +38,10 @@ PHP                                                                        NEWS
 - 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)
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
@@ -2167,6 +2167,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
`@@ -2167,6 +2167,9 @@ static void php_sqlite3_result_object_free_storage(zend_object object) / {{{ *`
`2167`	`2167`	`}`
`2168`	`2168`
`2169`	`2169`	`if (!Z_ISNULL(intern->stmt_obj_zval)) {`
	`2170`	`+ if (intern->stmt_obj && intern->stmt_obj->initialised) {`
	`2171`	`+ sqlite3_reset(intern->stmt_obj->stmt);`
	`2172`	`+ }`
`2170`	`2173`
`2171`	`2174`	`zval_ptr_dtor(&intern->stmt_obj_zval);`
`2172`	`2175`	`}`