Merge pull request #92 from ozh/curlopt

Restrict CURLOPT_PROTOCOLS on `defined()` instead of `version_compare()`
WordPress · Dec 31, 2013 · 541e6d0 · 541e6d0
2 parents 14b5f32 + 6856025
commit 541e6d0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/library/Requests/Transport/cURL.php b/library/Requests/Transport/cURL.php
@@ -68,9 +68,12 @@ public function __construct() {
 		if (version_compare($this->version, '7.10.5', '>=')) {
 			curl_setopt($this->fp, CURLOPT_ENCODING, '');
 		}
-		if (version_compare($this->version, '7.19.4', '>=')) {
+		if (defined('CURLOPT_PROTOCOLS')) {
 			curl_setopt($this->fp, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
 		}
+		if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+			curl_setopt($this->fp, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+		}
 	}
 
 	/**