Do not use full uri in request line for HTTPS requests via proxy

cakephp · Mar 24, 2015 · 23d4d11 · 23d4d11
1 parent 15c80f7
commit 23d4d11
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/Cake/Network/Http/HttpSocket.php b/lib/Cake/Network/Http/HttpSocket.php
@@ -927,7 +927,7 @@ protected function _buildRequestLine($request = array()) {
 
 		$request['uri'] = $this->_parseUri($request['uri']);
 		$request += array('method' => 'GET');
-		if (!empty($this->_proxy['host'])) {
+		if (!empty($this->_proxy['host']) && $request['uri']['scheme'] !== 'https') {
 			$request['uri'] = $this->_buildUri($request['uri'], '%scheme://%host:%port/%path?%query');
 		} else {
 			$request['uri'] = $this->_buildUri($request['uri'], '/%path?%query');