adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

optionnaly handles redirect before return the response

Browse source
This commit is contained in:
Clément Hallet 2011-11-08 18:55:58 +01:00
parent 606c30b77f
commit 62ae6d57e9
4 changed files with 74 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Cake/Network/Http/HttpResponse.php
View file

@ -124,6 +124,15 @@ class HttpResponse implements ArrayAccess {
return $this->code == 200;
}
/**
* If return is a valid 3xx (Redirection)
*
* @return boolean
*/
public function isRedirect() {
return in_array($this->code, array(301, 302, 303, 307)) && !is_null($this->getHeader('Location'));
}
/**
* Parses the given message and breaks it down in parts.
*

5
lib/Cake/Network/Http/HttpSocket.php
View file

@ -91,6 +91,7 @@ class HttpSocket extends CakeSocket {
'protocol' => 'tcp',
'port' => 80,
'timeout' => 30,
'redirect' => false,
'request' => array(
'uri' => array(
'scheme' => 'http',
@ -377,6 +378,10 @@ class HttpSocket extends CakeSocket {
}
$this->config['request']['cookies'][$Host] = array_merge($this->config['request']['cookies'][$Host], $this->response->cookies);
}
if($this->config['redirect'] && $this->response->isRedirect()) {
$request['uri'] = $this->response->getHeader('Location');
$this->response = $this->request($request);
}
return $this->response;
}

36
lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
View file

@ -164,6 +164,42 @@ class HttpResponseTest extends CakeTestCase {
$this->assertTrue($this->HttpResponse->isOk());
}
/**
* testIsRedirect
*
* @return void
*/
public function testIsRedirect() {
$this->HttpResponse->code = 0;
$this->assertFalse($this->HttpResponse->isRedirect());
$this->HttpResponse->code = -1;
$this->assertFalse($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 201;
$this->assertFalse($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 'what?';
$this->assertFalse($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 301;
$this->assertFalse($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 302;
$this->assertFalse($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 303;
$this->assertFalse($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 307;
$this->assertFalse($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 301;
$this->HttpResponse->headers['Location'] = 'http://somewhere/';
$this->assertTrue($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 302;
$this->HttpResponse->headers['Location'] = 'http://somewhere/';
$this->assertTrue($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 303;
$this->HttpResponse->headers['Location'] = 'http://somewhere/';
$this->assertTrue($this->HttpResponse->isRedirect());
$this->HttpResponse->code = 307;
$this->HttpResponse->headers['Location'] = 'http://somewhere/';
$this->assertTrue($this->HttpResponse->isRedirect());
}
/**
* Test that HttpSocket::parseHeader can take apart a given (and valid) $header string and turn it into an array.
*

25
lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
View file

@ -252,6 +252,7 @@ class HttpSocketTest extends CakeTestCase {
'protocol' => 'tcp',
'port' => 23,
'timeout' => 30,
'redirect' => false,
'request' => array(
'uri' => array(
'scheme' => 'https',
@ -276,6 +277,7 @@ class HttpSocketTest extends CakeTestCase {
'protocol' => 'tcp',
'port' => 80,
'timeout' => 30,
'redirect' => false,
'request' => array(
'uri' => array(
'scheme' => 'http',
@ -316,13 +318,14 @@ class HttpSocketTest extends CakeTestCase {
'protocol' => 'tcp',
'port' => 80,
'timeout' => 30,
'redirect' => false,
'request' => array(
'uri' => array (
'scheme' => 'http',
'host' => 'www.cakephp.org',
'port' => 80
),
'cookies' => array(),
'cookies' => array()
)
),
'request' => array(
@ -713,6 +716,26 @@ class HttpSocketTest extends CakeTestCase {
$this->assertEqual($response->first10, 'HTTP/1.x 2');
}
/**
* testRequestWithRedirect method
*
* @return void
*/
public function testRequestWithRedirect() {
$request = array(
'uri' => 'http://localhost/oneuri'
);
$serverResponse1 = "HTTP/1.x 302 Found\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\nLocation: http://localhost/anotheruri\r\n\r\n";
$serverResponse2 = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>You have been redirected</h1>";
$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse1));
$this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse2));
$this->Socket->config['redirect'] = true;
$response = $this->Socket->request($request);
$this->assertEquals('<h1>You have been redirected</h1>', $response->body());
}
/**
* testProxy method
*