From: Jani Taskinen <jani@php.net>
Date: Wed, 17 Dec 2008 14:00:20 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.3.0beta1~416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ce9e6d6d9ea52b1a74b640bb48a2164ef9ef027;p=php

MFH
---

diff --git a/ext/curl/tests/bug45161.phpt b/ext/curl/tests/bug45161.phpt
new file mode 100644
index 0000000000..eab1fd46e3
--- /dev/null
+++ b/ext/curl/tests/bug45161.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Bug #45161 (Reusing a curl handle leaks memory)
+--FILE--
+<?php
+
+// Fill memory for test
+$ch = curl_init();
+$fp = fopen('/dev/null', 'w');
+
+/*
+$i = $start = $end = 100000.00;
+for ($i = 0; $i < 100; $i++) {
+	curl_setopt($ch, CURLOPT_URL, 'http://127.0.0.1:9/');
+	curl_setopt($ch, CURLOPT_FILE, $fp);
+	curl_exec($ch);
+}
+*/
+
+// Start actual test
+$start = memory_get_usage() + 1024;
+for($i = 0; $i < 1024; $i++) {
+	curl_setopt($ch, CURLOPT_URL, 'http://127.0.0.1:9/');
+	curl_setopt($ch, CURLOPT_FILE, $fp);
+	curl_exec($ch);
+}
+if ($start < memory_get_usage()) {
+	echo 'FAIL';
+} else {
+	echo 'PASS';
+}
+echo "\n";
+fclose($fp);
+unset($fp);
+?>
+--EXPECT--
+PASS
diff --git a/ext/curl/tests/bug46739.phpt b/ext/curl/tests/bug46739.phpt
index 4e24b2f2a2..06a84ea8ed 100644
--- a/ext/curl/tests/bug46739.phpt
+++ b/ext/curl/tests/bug46739.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test bug #46739
+Bug #46739 (array returned by curl_getinfo should contain content_type key)
 --FILE--
 <?php
 $ch = curl_init('http://127.0.0.1:9/');
diff --git a/ext/curl/tests/curl_002.phpt b/ext/curl/tests/curl_002.phpt
index 2836c0c535..ed885caba2 100644
--- a/ext/curl/tests/curl_002.phpt
+++ b/ext/curl/tests/curl_002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test curl_opt() function with CURLOPT_RETURNTRANSFER paremter set to 1
+Test curl_opt() function with CURLOPT_RETURNTRANSFER parameter set to 1
 --CREDITS--
 Sebastian Deutsch <sebastian.deutsch@9elements.com>
 --SKIPIF--
diff --git a/ext/curl/tests/curl_006.phpt b/ext/curl/tests/curl_006.phpt
index c4a6faa413..95b6331c51 100755
--- a/ext/curl/tests/curl_006.phpt
+++ b/ext/curl/tests/curl_006.phpt
@@ -1,7 +1,7 @@
 --TEST--
-Test curl_opt() function with CURLOPT_WRITEFUNCTION paremter set to a closure
+Test curl_opt() function with CURLOPT_WRITEFUNCTION parameter set to a closure
 --SKIPIF--
-<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
+<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?>
 --FILE--
 <?php
 /* Prototype  : bool curl_setopt(resource ch, int option, mixed value)