adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed proxy method and calling togheter from host config.

Browse source
This commit is contained in:
Juan Basso 2010-12-06 11:28:40 -02:00
parent 30a70b700b
commit d656bdae3b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cake/libs/http_socket.php
View file

@ -245,6 +245,7 @@ class HttpSocket extends CakeSocket {
if (isset($host)) { if (isset($host)) {
$this->config['host'] = $host; $this->config['host'] = $host;
} }
$this->_setProxy();
$cookies = null; $cookies = null;
if (is_array($this->request['header'])) { if (is_array($this->request['header'])) {
@ -275,7 +276,6 @@ class HttpSocket extends CakeSocket {
$this->setAuthConfig('Basic', $this->request['uri']['user'], $this->request['uri']['pass']); $this->setAuthConfig('Basic', $this->request['uri']['user'], $this->request['uri']['pass']);
} }
$this->_setAuth(); $this->_setAuth();
$this->_setProxyConfig();
if (is_array($this->request['body'])) { if (is_array($this->request['body'])) {
$this->request['body'] = $this->_httpSerialize($this->request['body']); $this->request['body'] = $this->_httpSerialize($this->request['body']);
@ -501,7 +501,7 @@ class HttpSocket extends CakeSocket {
* @return void * @return void
* @throws Exception * @throws Exception
*/ */
protected function _setProxyConfig() { protected function _setProxy() {
if (empty($this->_proxy) || !isset($this->_proxy['host'], $this->_proxy['port'])) { if (empty($this->_proxy) || !isset($this->_proxy['host'], $this->_proxy['port'])) {
return; return;
} }

2
cake/tests/cases/libs/http_socket.test.php
View file

@ -662,7 +662,7 @@ class HttpSocketTest extends CakeTestCase {
$this->assertEqual($this->Socket->config['port'], 123); $this->assertEqual($this->Socket->config['port'], 123);
$this->Socket->setAuthConfig('Test', 'login', 'passwd'); $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->Socket->request('http://www.cakephp.org/');
$this->assertEqual($this->Socket->request['raw'], $expected); $this->assertEqual($this->Socket->request['raw'], $expected);
} }