mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-24 18:13:00 +01:00
Code Issues Releases Wiki Activity

Making the default CURLOPT_CONNECTTIMEOUT more forgiving and closer to the default value of 300s

Browse Source
This commit is contained in:
Michael Dowling 2013-04-08 13:45:19 -07:00
parent 10a7b6fe50
commit de755baecc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Guzzle/Http/Curl/CurlHandle.php
View File

@ -57,7 +57,7 @@ class CurlHandle
// Array of default cURL options.
$curlOptions = array(
CURLOPT_URL => $request->getUrl(),
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_RETURNTRANSFER => false,
CURLOPT_HEADER => false,
CURLOPT_PORT => $request->getPort(),

20
tests/Guzzle/Tests/Http/Curl/CurlHandleTest.php
View File

@ -237,7 +237,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
array('GET', 'http://www.google.com/', null, null, array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_HTTPHEADER => array('Accept:', 'Host: www.google.com', 'User-Agent: ' . $userAgent),
@ -250,7 +250,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
array('GET', 'http://127.0.0.1:8080', null, null, array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_PORT => 8080,
@ -260,7 +260,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
array('HEAD', 'http://www.google.com/', null, null, array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_HTTPHEADER => array('Accept:', 'Host: www.google.com', 'User-Agent: ' . $userAgent),
CURLOPT_NOBODY => 1
@ -269,7 +269,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
array('GET', 'https://michael:123@localhost/index.html?q=2', null, null, array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_HTTPHEADER => array(
@ -300,7 +300,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
array('POST', 'http://localhost:8124/post.php', null, $qs, array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_POSTFIELDS => 'x=y&z=a',
@ -323,7 +323,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
array('PUT', 'http://localhost:8124/put.php', null, EntityBody::factory(fopen($testFile, 'r+')), array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_READFUNCTION => 'callback',
@ -348,7 +348,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
), array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_POST => 1,
@ -372,7 +372,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
array('POST', 'http://localhost:8124/post.php', null, $postBody, array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_POST => 1,
@ -400,7 +400,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
), '{"hi":"there"}', array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_CUSTOMREQUEST => 'POST',
@ -428,7 +428,7 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
), '{"hi":"there"}', array(
CURLOPT_RETURNTRANSFER => 0,
CURLOPT_HEADER => 0,
CURLOPT_CONNECTTIMEOUT => 10,
CURLOPT_CONNECTTIMEOUT => 150,
CURLOPT_WRITEFUNCTION => 'callback',
CURLOPT_HEADERFUNCTION => 'callback',
CURLOPT_CUSTOMREQUEST => 'POST',