Renamed proxy method and calling togheter from host config.

cakephp · Dec 6, 2010 · d656bda · d656bda
1 parent 30a70b7
commit d656bda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
@@ -245,6 +245,7 @@ public function &request($request = array()) {
 		if (isset($host)) {
 			$this->config['host'] = $host;
 		}
+		$this->_setProxy();
 		$cookies = null;
 
 		if (is_array($this->request['header'])) {
@@ -275,7 +276,6 @@ public function &request($request = array()) {
 			$this->setAuthConfig('Basic', $this->request['uri']['user'], $this->request['uri']['pass']);
 		}
 		$this->_setAuth();
-		$this->_setProxyConfig();
 
 		if (is_array($this->request['body'])) {
 			$this->request['body'] = $this->_httpSerialize($this->request['body']);
@@ -501,7 +501,7 @@ protected function _setAuth() {
  * @return void
  * @throws Exception
  */
-	protected function _setProxyConfig() {
+	protected function _setProxy() {
 		if (empty($this->_proxy) || !isset($this->_proxy['host'], $this->_proxy['port'])) {
 			return;
 		}

diff --git a/cake/tests/cases/libs/http_socket.test.php b/cake/tests/cases/libs/http_socket.test.php
@@ -662,7 +662,7 @@ public function testProxy() {
 		$this->assertEqual($this->Socket->config['port'], 123);
 
 		$this->Socket->setAuthConfig('Test', 'login', 'passwd');
-		$expected = "GET http://www.cakephp.org/ HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nAuthorization: Test login.passwd\r\nProxy-Authorization: Test mark.secret\r\n\r\n";
+		$expected = "GET http://www.cakephp.org/ HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nProxy-Authorization: Test mark.secret\r\nAuthorization: Test login.passwd\r\n\r\n";
 		$this->Socket->request('http://www.cakephp.org/');
 		$this->assertEqual($this->Socket->request['raw'], $expected);
 	}