Merge pull request #638 from zachborboa/disabletimeout

Implement disableTimeout()

README.md

@@ -202,6 +202,7 @@ Curl::call()
 Curl::close()
 Curl::complete($callback)
 Curl::delete($url, $query_parameters = array(), $data = array())
+Curl::disableTimeout()
 Curl::download($url, $mixed_filename)
 Curl::error($callback)
 Curl::exec($ch = null)
@@ -305,6 +306,7 @@ MultiCurl::addSearch($url, $data = array())
 MultiCurl::beforeSend($callback)
 MultiCurl::close()
 MultiCurl::complete($callback)
+MultiCurl::disableTimeout()
 MultiCurl::error($callback)
 MultiCurl::getOpt($option)
 MultiCurl::removeHeader($key)

src/Curl/Curl.php

@@ -1191,6 +1191,16 @@ class Curl
         $this->setOpt(CURLOPT_TIMEOUT, $seconds);
     }
 
+    /**
+     * Disable Timeout
+     *
+     * @access public
+     */
+    public function disableTimeout()
+    {
+        $this->setTimeout(null);
+    }
+
     /**
      * Set Url
      *

src/Curl/MultiCurl.php

@@ -765,6 +765,16 @@ class MultiCurl
         $this->setOpt(CURLOPT_TIMEOUT, $seconds);
     }
 
+    /**
+     * Disable Timeout
+     *
+     * @access public
+     */
+    public function disableTimeout()
+    {
+        $this->setTimeout(null);
+    }
+
     /**
      * Set Url
      *

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -3902,4 +3902,12 @@ class CurlTest extends \PHPUnit\Framework\TestCase
         $curl->setRange($range);
         $this->assertEquals($range, $curl->getOpt(CURLOPT_RANGE));
     }
+
+    public function testDisableTimeout()
+    {
+        $curl = new Curl();
+        $this->assertEquals(Curl::DEFAULT_TIMEOUT, $curl->getOpt(CURLOPT_TIMEOUT));
+        $curl->disableTimeout();
+        $this->assertNull($curl->getOpt(CURLOPT_TIMEOUT));
+    }
 }

tests/PHPCurlClass/PHPMultiCurlClassTest.php

@@ -3410,4 +3410,15 @@ class MultiCurlTest extends \PHPUnit\Framework\TestCase
         $multi_curl->setRange($range);
         $this->assertEquals($range, $multi_curl->getOpt(CURLOPT_RANGE));
     }
+
+    public function testDisableTimeout()
+    {
+        $multi_curl = new MultiCurl();
+        $multi_curl->disableTimeout();
+        $get = $multi_curl->addGet(Test::TEST_URL);
+        $get->complete(function ($instance) {
+            \PHPUnit\Framework\Assert::assertNull($instance->getOpt(CURLOPT_TIMEOUT));
+        });
+        $multi_curl->start();
+    }
 }