]> granicus.if.org Git - php/commitdiff
Make these tests fail faster, Thanks to GFW
authorXinchen Hui <laruence@gmail.com>
Thu, 29 Oct 2015 07:00:43 +0000 (15:00 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 29 Oct 2015 07:01:43 +0000 (15:01 +0800)
ext/curl/tests/bug52202.phpt
ext/curl/tests/bug64267.phpt
ext/curl/tests/bug68937.phpt
ext/curl/tests/bug68937_2.phpt

index a304d7f77a89e34ad1726340ef176f97a639c9bf..eee386480ee29fad092ab37824bccad3f8ed13cd 100644 (file)
@@ -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));
index 1b115588ffa7b1e4604ddb02c72bcc6feb8985ca..5d5330fef3738a5e8f91ae3a7fa58d13b9fe95fc 100644 (file)
@@ -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, [
index a661ec01ce300951fec4ac1e44105aacd44c6f54..139cc17abdf445680bd1597e7cf70ce2bc2bda6c 100644 (file)
@@ -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) {
index 418a96dc8d85bf98dcbceefc6ad8b3f9f39d13dc..29851ec6e13b86177ddc9c241eb9d599e4423264 100644 (file)
@@ -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) {