From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Mar 2015 09:22:56 +0000 (+0800)
Subject: Revert "Fix #63486"
X-Git-Tag: php-5.5.24RC1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9af1383a3f9835db99e9b68eb9bcb6a0f341e339;p=php

Revert "Fix #63486"

This reverts commit f4c96ffcb565c1daa76aa58256e4df6f111f8803.
---

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
index 52da163aa5..ce480d8fee 100644
--- a/ext/mysqli/php_mysqli_structs.h
+++ b/ext/mysqli/php_mysqli_structs.h
@@ -313,7 +313,6 @@ extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
 	mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*(__id) TSRMLS_CC);\
 	efree(intern->ptr); \
 	intern->ptr = NULL; \
-	ZVAL_NULL(*__id); \
 }
 
 
diff --git a/ext/mysqli/tests/bug63486.phpt b/ext/mysqli/tests/bug63486.phpt
deleted file mode 100644
index 72b8663e43..0000000000
--- a/ext/mysqli/tests/bug63486.phpt
+++ /dev/null
@@ -1,55 +0,0 @@
---TEST--
-mysqli_free_resource() - resets the zval to NULL
---SKIPIF--
-<?php
-	require_once('skipif.inc');
-	require_once('skipifemb.inc');
-	require_once('skipifconnectfailure.inc');
-?>
---FILE--
-<?php
-	require('connect.inc');
-	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-		printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
-		die();
-	}
-
-	if (!($res = mysqli_query($link, "SELECT 1"))) {
-		printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-		die();
-	}
-
-	$row = mysqli_fetch_row($res);
-	var_dump($row);
-	var_dump($res);
-	
-	mysqli_free_result($res);
-	
-	var_dump($row);
-	var_dump($res);
-?>
---EXPECTF--
-array(1) {
-  [0]=>
-  string(1) "1"
-}
-object(mysqli_result)#3 (5) {
-  ["current_field"]=>
-  int(0)
-  ["field_count"]=>
-  int(1)
-  ["lengths"]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  ["num_rows"]=>
-  int(1)
-  ["type"]=>
-  int(0)
-}
-array(1) {
-  [0]=>
-  string(1) "1"
-}
-NULL