Skip to content

Commit 138c0e4

Browse files
authored
Merge pull request php-curl-class#638 from zachborboa/disabletimeout
Implement disableTimeout()
2 parents 95f1386 + ab407d6 commit 138c0e4

File tree

5 files changed

+41
-0
lines changed

5 files changed

+41
-0
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ Curl::call()
202202
Curl::close()
203203
Curl::complete($callback)
204204
Curl::delete($url, $query_parameters = array(), $data = array())
205+
Curl::disableTimeout()
205206
Curl::download($url, $mixed_filename)
206207
Curl::error($callback)
207208
Curl::exec($ch = null)
@@ -305,6 +306,7 @@ MultiCurl::addSearch($url, $data = array())
305306
MultiCurl::beforeSend($callback)
306307
MultiCurl::close()
307308
MultiCurl::complete($callback)
309+
MultiCurl::disableTimeout()
308310
MultiCurl::error($callback)
309311
MultiCurl::getOpt($option)
310312
MultiCurl::removeHeader($key)

src/Curl/Curl.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,6 +1191,16 @@ public function setTimeout($seconds)
11911191
$this->setOpt(CURLOPT_TIMEOUT, $seconds);
11921192
}
11931193

1194+
/**
1195+
* Disable Timeout
1196+
*
1197+
* @access public
1198+
*/
1199+
public function disableTimeout()
1200+
{
1201+
$this->setTimeout(null);
1202+
}
1203+
11941204
/**
11951205
* Set Url
11961206
*

src/Curl/MultiCurl.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,16 @@ public function setTimeout($seconds)
765765
$this->setOpt(CURLOPT_TIMEOUT, $seconds);
766766
}
767767

768+
/**
769+
* Disable Timeout
770+
*
771+
* @access public
772+
*/
773+
public function disableTimeout()
774+
{
775+
$this->setTimeout(null);
776+
}
777+
768778
/**
769779
* Set Url
770780
*

tests/PHPCurlClass/PHPCurlClassTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3902,4 +3902,12 @@ public function testSetRange()
39023902
$curl->setRange($range);
39033903
$this->assertEquals($range, $curl->getOpt(CURLOPT_RANGE));
39043904
}
3905+
3906+
public function testDisableTimeout()
3907+
{
3908+
$curl = new Curl();
3909+
$this->assertEquals(Curl::DEFAULT_TIMEOUT, $curl->getOpt(CURLOPT_TIMEOUT));
3910+
$curl->disableTimeout();
3911+
$this->assertNull($curl->getOpt(CURLOPT_TIMEOUT));
3912+
}
39053913
}

tests/PHPCurlClass/PHPMultiCurlClassTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3410,4 +3410,15 @@ public function testSetRange()
34103410
$multi_curl->setRange($range);
34113411
$this->assertEquals($range, $multi_curl->getOpt(CURLOPT_RANGE));
34123412
}
3413+
3414+
public function testDisableTimeout()
3415+
{
3416+
$multi_curl = new MultiCurl();
3417+
$multi_curl->disableTimeout();
3418+
$get = $multi_curl->addGet(Test::TEST_URL);
3419+
$get->complete(function ($instance) {
3420+
\PHPUnit\Framework\Assert::assertNull($instance->getOpt(CURLOPT_TIMEOUT));
3421+
});
3422+
$multi_curl->start();
3423+
}
34133424
}

0 commit comments

Comments
 (0)