php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-01 13:12:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.6

Browse Source 
* PHP-5.5:
  Follow 308 Permanent Redirect responses.
This commit is contained in:
Adam Harvey
2014-06-12 18:17:18 -07:00
parent e082199d8e 2546434008
commit 84f339546a
3 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -42,6 +42,9 @@ PHP NEWS
- SPL:
. Fixed bug #66127 (Segmentation fault with ArrayObject unset). (Stas)
- Streams:
. Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)
- Tokenizer:
. Fixed bug #67395 (token_name() does not return name for T_POW and T_POW_EQUAL
token). (Ferenc)

5
ext/standard/http_fopen_wrapper.c
View File

@@ -752,10 +752,11 @@ finish:
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
follow_location = Z_LVAL_PP(tmpzval);
} else if (!(response_code >= 300 && response_code < 304 || 307 == response_code)) {
} else if (!(response_code >= 300 && response_code < 304 || 307 == response_code || 308 == response_code)) {
/* we shouldn't redirect automatically
if follow_location isn't set and response_code not in (300, 301, 302, 303 and 307)
see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.1 */
see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.1
RFC 7238 defines 308: http://tools.ietf.org/html/rfc7238 */
follow_location = 0;
}
strlcpy(location, http_header_line + 10, sizeof(location));

49
ext/standard/tests/http/bug67430.phpt Normal file
View File

@@ -0,0 +1,49 @@
--TEST--
Bug #67430 (http:// wrapper doesn't follow 308 redirects)
--INI--
allow_url_fopen=1
--SKIPIF--
<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
--FILE--
<?php
require 'server.inc';
function do_test($follow) {
$options = [
'http' => [
'method' => 'POST',
'follow_location' => $follow,
],
];
$ctx = stream_context_create($options);
$responses = [
"data://text/plain,HTTP/1.1 308\r\nLocation: /foo\r\n\r\n",
"data://text/plain,HTTP/1.1 200\r\nConnection: close\r\n\r\n",
];
$pid = http_server('tcp://127.0.0.1:12342', $responses, $output);
$fd = fopen('http://127.0.0.1:12342/', 'rb', false, $ctx);
fseek($output, 0, SEEK_SET);
echo stream_get_contents($output);
http_server_kill($pid);
}
do_test(true);
do_test(false);
?>
Done
--EXPECT--
POST / HTTP/1.0
Host: 127.0.0.1:12342
GET /foo HTTP/1.0
Host: 127.0.0.1:12342
POST / HTTP/1.0
Host: 127.0.0.1:12342
Done