com php-src: Make these tests fail faster, Thanks to GFW: ext/curl/tests/bug52202.phpt ext/curl/tests/bug64267.phpt ext/curl/tests/bug68937.phpt
ext/curl/tests/bug68937 _2.phpt

Commit: 241e340f782dd1d2bbd15df684a210a878c3be35 Author: Xinchen Hui <laruence@gmail.com> Thu, 29 Oct 2015 15:00:43 +0800 Parents: 661798ad348f572d3b0bc7424bba170dc2aca129 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=241e340f782dd1d2bbd15df684a210a878c3be35 Log: Make these tests fail faster, Thanks to GFW Changed paths: M ext/curl/tests/bug52202.phpt M ext/curl/tests/bug64267.phpt M ext/curl/tests/bug68937.phpt M ext/curl/tests/bug68937_2.phpt Diff: diff --git a/ext/curl/tests/bug52202.phpt b/ext/curl/tests/bug52202.phpt index a304d7f..eee3864 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 1b11558..5d5330f 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 a661ec0..139cc17 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 418a96d..29851ec 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) {