adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the version option function as intended.

Browse source 
The version option is documented but does not work. While this 'breaks'
behavior, it also fixes what I think is a more important issue.

Refs #5234
This commit is contained in:
mark_story 2014-11-24 22:23:12 -05:00
parent 1fed92d94c
commit 1e6d22b8cb
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -877,11 +877,10 @@ class HttpSocket extends CakeSocket {
* Builds a request line according to HTTP/1.1 specs. Activate quirks mode to work outside specs. * Builds a request line according to HTTP/1.1 specs. Activate quirks mode to work outside specs.
* *
* @param array $request Needs to contain a 'uri' key. Should also contain a 'method' key, otherwise defaults to GET. * @param array $request Needs to contain a 'uri' key. Should also contain a 'method' key, otherwise defaults to GET.
* @param string $versionToken The version token to use, defaults to HTTP/1.1
* @return string Request line * @return string Request line
* @throws SocketException * @throws SocketException
*/ */
protected function _buildRequestLine($request = array(), $versionToken = 'HTTP/1.1') { protected function _buildRequestLine($request = array()) {
$asteriskMethods = array('OPTIONS'); $asteriskMethods = array('OPTIONS');
if (is_string($request)) { if (is_string($request)) {
@ -907,7 +906,8 @@ class HttpSocket extends CakeSocket {
if (!$this->quirksMode && $request['uri'] === '*' && !in_array($request['method'], $asteriskMethods)) { if (!$this->quirksMode && $request['uri'] === '*' && !in_array($request['method'], $asteriskMethods)) {
throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', implode(',', $asteriskMethods))); throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', implode(',', $asteriskMethods)));
} }
return $request['method'] . ' ' . $request['uri'] . ' ' . $versionToken . "\r\n"; $version = isset($request['version']) ? $request['version'] : '1.1';
return $request['method'] . ' ' . $request['uri'] . ' HTTP/' . $version . "\r\n";
} }
/** /**

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

@ -138,8 +138,8 @@ class TestHttpSocket extends HttpSocket {
* @param string $versionToken The version token to use, defaults to HTTP/1.1 * @param string $versionToken The version token to use, defaults to HTTP/1.1
* @return string Request line * @return string Request line
*/ */
public function buildRequestLine($request = array(), $versionToken = 'HTTP/1.1') { public function buildRequestLine($request = array()) {
return parent::_buildRequestLine($request, $versionToken); return parent::_buildRequestLine($request);
} }
/** /**
@ -525,6 +525,7 @@ class HttpSocketTest extends CakeTestCase {
), ),
array( array(
'request' => array( 'request' => array(
'version' => '1.0',
'method' => 'POST', 'method' => 'POST',
'uri' => 'https://www.cakephp.org/posts/add', 'uri' => 'https://www.cakephp.org/posts/add',
'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'), 'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'),
@ -532,6 +533,8 @@ class HttpSocketTest extends CakeTestCase {
), ),
'expectation' => array( 'expectation' => array(
'request' => array( 'request' => array(
'version' => '1.0',
'line' => "POST /posts/add HTTP/1.0\r\n",
'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 38\r\nCookie: foo=bar\r\n", 'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 38\r\nCookie: foo=bar\r\n",
'cookies' => array( 'cookies' => array(
'foo' => array('value' => 'bar'), 'foo' => array('value' => 'bar'),
@ -1245,9 +1248,6 @@ class HttpSocketTest extends CakeTestCase {
$r = $this->Socket->buildRequestLine($request); $r = $this->Socket->buildRequestLine($request);
$this->assertEquals("GET /search?q=socket HTTP/1.1\r\n", $r); $this->assertEquals("GET /search?q=socket HTTP/1.1\r\n", $r);
$r = $this->Socket->buildRequestLine($request, 'CAKE-HTTP/0.1');
$this->assertEquals("GET /search?q=socket CAKE-HTTP/0.1\r\n", $r);
$request = array('method' => 'OPTIONS', 'uri' => '*'); $request = array('method' => 'OPTIONS', 'uri' => '*');
$r = $this->Socket->buildRequestLine($request); $r = $this->Socket->buildRequestLine($request);
$this->assertEquals("OPTIONS * HTTP/1.1\r\n", $r); $this->assertEquals("OPTIONS * HTTP/1.1\r\n", $r);
@ -1259,6 +1259,17 @@ class HttpSocketTest extends CakeTestCase {
$r = $this->Socket->buildRequestLine("GET * HTTP/1.1\r\n"); $r = $this->Socket->buildRequestLine("GET * HTTP/1.1\r\n");
$this->assertEquals("GET * HTTP/1.1\r\n", $r); $this->assertEquals("GET * HTTP/1.1\r\n", $r);
$request = array(
'version' => '1.0',
'method' => 'GET',
'uri' => array(
'path' => '/search',
'query' => array('q' => 'socket')
)
);
$r = $this->Socket->buildRequestLine($request);
$this->assertEquals("GET /search?q=socket HTTP/1.0\r\n", $r);
} }
/** /**