com php-src: Fixed expected output of a few cURL test cases: ext/curl/tests/bug48203_multi.phpt ext/curl/tes ts/bug54798.phpt
ext/curl/tests/curl_file_del eted_before_curl_close.phpt ext/curl/tests/curl_set opt_basic002.phpt

Commit: 9443fb999d35abedbd12e7c3340ae756cc1f9298 Author: Tjerk Meesters <datibbaw@php.net> Fri, 28 Feb 2014 18:59:06 +0800 Parents: 488e64dbe4052eafd8b8bb5dd07b0c9ea6fa97f3 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9443fb999d35abedbd12e7c3340ae756cc1f9298 Log: Fixed expected output of a few cURL test cases Changed paths: M ext/curl/tests/bug48203_multi.phpt M ext/curl/tests/bug54798.phpt M ext/curl/tests/curl_file_deleted_before_curl_close.phpt M ext/curl/tests/curl_setopt_basic002.phpt Diff: diff --git a/ext/curl/tests/bug48203_multi.phpt b/ext/curl/tests/bug48203_multi.phpt index 7d4ee47..501b778 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 7ec84ad..f633a8a 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 592f110..3a4d949 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 d90ecb7..074158a 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