From: Tjerk Meesters <datibbaw@php.net>
Date: Fri, 28 Feb 2014 10:59:06 +0000 (+0800)
Subject: Fixed expected output of a few cURL test cases
X-Git-Tag: php-5.5.11RC1~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9443fb999d35abedbd12e7c3340ae756cc1f9298;p=php

Fixed expected output of a few cURL test cases
---

diff --git a/ext/curl/tests/bug48203_multi.phpt b/ext/curl/tests/bug48203_multi.phpt
index 7d4ee4769e..501b77843e 100644
--- a/ext/curl/tests/bug48203_multi.phpt
+++ b/ext/curl/tests/bug48203_multi.phpt
@@ -81,8 +81,7 @@ Ok for CURLOPT_WRITEHEADER
 Warning: curl_multi_exec(): CURLOPT_FILE resource has gone away, resetting to default in %sbug48203_multi.php on line 36
 
 Warning: curl_multi_exec(): CURLOPT_FILE resource has gone away, resetting to default in %sbug48203_multi.php on line 36
-%A
-Ok for CURLOPT_FILE
+%AOk for CURLOPT_FILE
 
 Warning: curl_multi_exec(): CURLOPT_INFILE resource has gone away, resetting to default in %sbug48203_multi.php on line 36
 
diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt
index 7ec84addae..f633a8ab2a 100644
--- a/ext/curl/tests/bug54798.phpt
+++ b/ext/curl/tests/bug54798.phpt
@@ -58,15 +58,14 @@ foreach($options_to_check as $option) {
 --EXPECTF--
 Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %sbug54798.php on line %d
 * About to connect() %a
-* Closing connection #%d
+* Closing connection %d
 Ok for CURLOPT_STDERR
 
 Warning: curl_exec(): CURLOPT_WRITEHEADER resource has gone away, resetting to default in %sbug54798.php on line 24
 Ok for CURLOPT_WRITEHEADER
 
 Warning: curl_exec(): CURLOPT_FILE resource has gone away, resetting to default in %sbug54798.php on line 24
-%a
-Ok for CURLOPT_FILE
+%aOk for CURLOPT_FILE
 
 Warning: curl_exec(): CURLOPT_INFILE resource has gone away, resetting to default in %sbug54798.php on line %d
 Ok for CURLOPT_INFILE
diff --git a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
index 592f110fbe..3a4d949e75 100644
--- a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
+++ b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
@@ -33,6 +33,5 @@ echo "Closed correctly\n";
 <?php
 unlink(dirname(__FILE__) . '/curl_file_deleted_before_curl_close.tmp');
 ?>
---EXPECTF--
-* Closing connection #%d
+--EXPECT--
 Closed correctly
diff --git a/ext/curl/tests/curl_setopt_basic002.phpt b/ext/curl/tests/curl_setopt_basic002.phpt
index d90ecb7bd2..074158a4b3 100644
--- a/ext/curl/tests/curl_setopt_basic002.phpt
+++ b/ext/curl/tests/curl_setopt_basic002.phpt
@@ -48,5 +48,4 @@ curl_close($ch);
 *** Testing curl_setopt with CURLOPT_STDERR
 string(%d) "%S"
 string(%d) "%S"
-* Closing connection #%d