Merge pull request #474 from stevecoug/master

Allow settings to override many cURL options

Author: oscarotero

README.md

@@ -315,7 +315,14 @@ use Embed\Http\CurlClient;
 $client = new CurlClient();
 $client->setSettings([
     'cookies_path' => $cookies_path,
-    'ignored_errors' => [18]
+    'ignored_errors' => [18],
+    'max_redirs' => 3,               // see CURLOPT_MAXREDIRS
+    'connect_timeout' => 2,          // see CURLOPT_CONNECTTIMEOUT
+    'timeout' => 2,                  // see CURLOPT_TIMEOUT
+    'ssl_verify_host' => 2,          // see CURLOPT_SSL_VERIFYHOST
+    'ssl_verify_peer' => 1,          // see CURLOPT_SSL_VERIFYPEER
+    'follow_location' => true,       // see CURLOPT_FOLLOWLOCATION
+    'user_agent' => 'Mozilla',       // see CURLOPT_USERAGENT
 ]);
 
 $embed = new Embed(new Crawler($client));

src/Http/CurlDispatcher.php

@@ -87,18 +87,18 @@ private function __construct(array $settings, RequestInterface $request)
         curl_setopt_array($this->curl, [
             CURLOPT_HTTPHEADER => $this->getRequestHeaders(),
             CURLOPT_POST => strtoupper($request->getMethod()) === 'POST',
-            CURLOPT_MAXREDIRS => 10,
-            CURLOPT_CONNECTTIMEOUT => 10,
-            CURLOPT_TIMEOUT => 10,
+            CURLOPT_MAXREDIRS => $settings['max_redirs'] ?? 10,
+            CURLOPT_CONNECTTIMEOUT => $settings['connect_timeout'] ?? 10,
+            CURLOPT_TIMEOUT => $settings['timeout'] ?? 10,
             CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_SSL_VERIFYHOST => 0,
-            CURLOPT_SSL_VERIFYPEER => false,
+            CURLOPT_SSL_VERIFYHOST => $settings['ssl_verify_host'] ?? 0,
+            CURLOPT_SSL_VERIFYPEER => $settings['ssl_verify_peer'] ?? false,
             CURLOPT_ENCODING => '',
             CURLOPT_CAINFO => CaBundle::getSystemCaRootBundlePath(),
             CURLOPT_AUTOREFERER => true,
-            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_FOLLOWLOCATION => $settings['follow_location'] ?? true,
             CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4,
-            CURLOPT_USERAGENT => $request->getHeaderLine('User-Agent'),
+            CURLOPT_USERAGENT => $settings['user_agent'] ?? $request->getHeaderLine('User-Agent'),
             CURLOPT_COOKIEJAR => $cookies,
             CURLOPT_COOKIEFILE => $cookies,
             CURLOPT_HEADERFUNCTION => [$this, 'writeHeader'],