From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 29 Oct 2015 07:00:43 +0000 (+0800)
Subject: Make these tests fail faster, Thanks to GFW
X-Git-Tag: php-7.1.0alpha2~40^2~36^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=241e340f782dd1d2bbd15df684a210a878c3be35;p=php

Make these tests fail faster, Thanks to GFW
---

diff --git a/ext/curl/tests/bug52202.phpt b/ext/curl/tests/bug52202.phpt
index a304d7f77a..eee386480e 100644
--- a/ext/curl/tests/bug52202.phpt
+++ b/ext/curl/tests/bug52202.phpt
@@ -9,6 +9,8 @@ if (!extension_loaded('curl')) exit("skip curl extension not loaded");
 $curl = curl_init("http://www.google.com");
 curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($curl, CURLOPT_PRIVATE, "123");
+curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 1);
+curl_setopt($curl, CURLOPT_TIMEOUT, 1);
 curl_exec($curl);
 
 var_dump(curl_getinfo($curl, CURLINFO_PRIVATE));
diff --git a/ext/curl/tests/bug64267.phpt b/ext/curl/tests/bug64267.phpt
index 1b115588ff..5d5330fef3 100644
--- a/ext/curl/tests/bug64267.phpt
+++ b/ext/curl/tests/bug64267.phpt
@@ -15,7 +15,9 @@ var_dump(curl_setopt_array($c, [
 	CURLOPT_RETURNTRANSFER => true,
 	CURLOPT_UPLOAD => true,
 	CURLOPT_INFILE => $f,
-	CURLOPT_INFILESIZE => filesize(__FILE__)
+	CURLOPT_INFILESIZE => filesize(__FILE__),
+	CURLOPT_CONNECTTIMEOUT => 1,
+	CURLOPT_TIMEOUT => 1,
 ]));
 fclose($f);
 var_dump(curl_setopt_array($c, [
diff --git a/ext/curl/tests/bug68937.phpt b/ext/curl/tests/bug68937.phpt
index a661ec01ce..139cc17abd 100644
--- a/ext/curl/tests/bug68937.phpt
+++ b/ext/curl/tests/bug68937.phpt
@@ -17,7 +17,9 @@ curl_setopt_array($ch, array(
 	CURLOPT_HTTPHEADER => array(
 		'Content-Length: 1',
 	),
-	CURLOPT_READFUNCTION => 'curl_read'
+	CURLOPT_READFUNCTION => 'curl_read',
+	CURLOPT_CONNECTTIMEOUT=> 1,
+	CURLOPT_TIMEOUT=>1
 ));
 
 function curl_read($ch, $fp, $len) {
diff --git a/ext/curl/tests/bug68937_2.phpt b/ext/curl/tests/bug68937_2.phpt
index 418a96dc8d..29851ec6e1 100644
--- a/ext/curl/tests/bug68937_2.phpt
+++ b/ext/curl/tests/bug68937_2.phpt
@@ -18,7 +18,9 @@ curl_setopt_array($ch, array(
 	CURLOPT_HTTPHEADER => array(
 		'Content-Length: 1',
 	),
-	CURLOPT_READFUNCTION => 'curl_read'
+	CURLOPT_READFUNCTION => 'curl_read',
+	CURLOPT_CONNECTTIMEOUT => 1,
+	CURLOPT_TIMEOUT => 1
 ));
 
 function curl_read($ch, $fp, $len) {