From: Ulf Wendel <uw@php.net>
Date: Wed, 11 Jul 2007 14:44:18 +0000 (+0000)
Subject: Whitespace/Coding Standards and new check what happens if one tries to
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8777568cc2ab9398ec5ded62b8308d7c23b1d3df;p=php

Whitespace/Coding Standards and new check what happens if one tries to
free not a mysql resource but a file resource.
---

diff --git a/ext/mysql/tests/mysql_free_result.phpt b/ext/mysql/tests/mysql_free_result.phpt
index 77b32ee8ca..41903f467e 100644
--- a/ext/mysql/tests/mysql_free_result.phpt
+++ b/ext/mysql/tests/mysql_free_result.phpt
@@ -2,30 +2,39 @@
 mysql_free_result()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (!is_null($tmp = @mysql_free_result()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = @mysql_free_result($link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-
-    require('table.inc');    
-    if (!$res = mysql_query("SELECT id FROM test ORDER BY id LIMIT 1", $link)) {
-        printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
-    } 
-        
-    var_dump(mysql_free_result($res));    
-    var_dump(mysql_free_result($res));
-        
-    mysql_close($link);    
-    print "done!";
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_free_result()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_free_result($link)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id FROM test ORDER BY id LIMIT 1", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+var_dump(mysql_free_result($res));
+var_dump(mysql_free_result($res));
+
+if ($tmp = sys_get_temp_dir()) {
+	$tmpname = tempnam($tmp, 'free_result');
+	if ($fp = fopen($tmpname, 'w')) {
+		if (false !== ($tmp = @mysql_free_result($fp)))
+			printf("[004] Expecting boolean/false got %s/%s\n", gettype($tmp), $tmp);
+		fclose($fp);
+		@unlink($tmpname);
+	}
+}
+
+mysql_close($link);
+print "done!";
 ?>
 --EXPECTF--
 bool(true)