fix for #1

Author: codemasher

src/CurlHandle.php

@@ -52,9 +52,7 @@ public function __construct(RequestInterface $request, ResponseInterface $respon
 		$this->options  = $options;
 		$this->curl     = curl_init();
 
-		if(is_array($this->options->curl_options)){
-			curl_setopt_array($this->curl, $this->options->curl_options);
-		}
+		curl_setopt_array($this->curl, $this->options->curl_options);
 	}
 
 	/**
@@ -118,8 +116,8 @@ public function init(){
 			CURLOPT_PROTOCOLS      => CURLPROTO_HTTP | CURLPROTO_HTTPS,
 			CURLOPT_SSL_VERIFYPEER => true,
 			CURLOPT_SSL_VERIFYHOST => 2,
-			CURLOPT_CAINFO         => is_file($this->options->ca_info) ? $this->options->ca_info : null,
-			CURLOPT_TIMEOUT        => (int)$this->options->timeout,
+			CURLOPT_CAINFO         => $this->options->ca_info,
+			CURLOPT_TIMEOUT        => 10,
 			CURLOPT_CONNECTTIMEOUT => 30,
 			CURLOPT_WRITEFUNCTION  => [$this, 'writefunction'],
 			CURLOPT_HEADERFUNCTION => [$this, 'headerfunction'],
@@ -223,7 +221,9 @@ public function init(){
 			$options[CURLOPT_HTTPHEADER][] = 'Content-Type:';
 		}
 
-		curl_setopt_array($this->curl, $this->options->curl_options + $options);
+		// overwrite the default values with $curl_options
+		// @todo: callback/middleware for the cURL options array?
+		curl_setopt_array($this->curl, $options + $this->options->curl_options);
 
 		return $this->curl;
 	}

src/HTTPOptions.php

@@ -16,10 +16,8 @@
 
 /**
  * @property string $user_agent
- * @property int    $timeout
  * @property array  $curl_options
  * @property string $ca_info
- * @property int    $max_redirects
  */
 class HTTPOptions extends SettingsContainerAbstract{
 	use HTTPOptionsTrait;

src/HTTPOptionsTrait.php

@@ -19,14 +19,12 @@ trait HTTPOptionsTrait{
 	 */
 	public $user_agent = 'chillerlanHttpInterface/2.0 +https://github.com/chillerlan/php-httpinterface';
 
-	/**
-	 * @var int
-	 */
-	public $timeout = 10;
-
 	/**
 	 * options for each curl instance
 	 *
+	 * this array is being merged into the default options as the last thing before curl_exec().
+	 * none of the values (except existence of the CA file) will be checked - that's up to the implementation.
+	 *
 	 * @var array
 	 */
 	public $curl_options = [];
@@ -41,8 +39,29 @@ trait HTTPOptionsTrait{
 	public $ca_info = null;
 
 	/**
-	 * @var int
+	 * HTTPOptionsTrait constructor
+	 *
+	 * @throws \chillerlan\HTTP\ClientException
 	 */
-	public $max_redirects = 0;
+	protected function HTTPOptionsTrait():void{
+
+		if(!is_array($this->curl_options)){
+			$this->curl_options = [];
+		}
+
+		// we cannot verify a peer against a non-existent ca file, so turn it off in that case
+		if(!$this->ca_info || !is_file($this->ca_info)
+		   || (isset($this->curl_options[CURLOPT_CAINFO]) && !is_file($this->curl_options[CURLOPT_CAINFO]))){
+
+			$this->curl_options += [
+				CURLOPT_SSL_VERIFYPEER => false,
+				CURLOPT_CAINFO         => null,
+			];
+		}
+
+		if(!is_string($this->user_agent) || empty(trim($this->user_agent))){
+			throw new ClientException('invalid user agent');
+		}
+	}
 
 }