ENGCOM-4424: Fixed curl adapter to properly set http version based on $http_ver argument #21549

magento-engcom-team · magento-engcom-team · commit b1e498770fda · 2019-03-03T03:43:22.000-06:00
- Merge Pull Request #21549 from davidalger/magento2:bugfix/curl-adapater-ignores-http-version - Merged commits: 1. b57dab0
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -183,6 +183,12 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '
             curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, 'GET');
         }
 
+        if ($http_ver === \Zend_Http_Client::HTTP_1) {
+            curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        } elseif ($http_ver === \Zend_Http_Client::HTTP_0) {
+            curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+        }
+
         if (is_array($headers)) {
             curl_setopt($this->_getResource(), CURLOPT_HTTPHEADER, $headers);
         }

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,12 @@ public function write($method, $url, $http_ver = '1.1', $headers = [], $body = '`
`183`	`183`	`curl_setopt($this->_getResource(), CURLOPT_CUSTOMREQUEST, 'GET');`
`184`	`184`	`}`
`185`	`185`
	`186`	`+ if ($http_ver === \Zend_Http_Client::HTTP_1) {`
	`187`	`+ curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);`
	`188`	`+ } elseif ($http_ver === \Zend_Http_Client::HTTP_0) {`
	`189`	`+ curl_setopt($this->_getResource(), CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);`
	`190`	`+ }`
	`191`	`+`
`186`	`192`	`if (is_array($headers)) {`
`187`	`193`	`curl_setopt($this->_getResource(), CURLOPT_HTTPHEADER, $headers);`
`188`	`194`	`}`