archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Follow 308 Permanent Redirect responses.

Browse source 
Fixes bug #67430 (http:// wrapper doesn't follow 308 redirects).
This commit is contained in:
Adam Harvey 2014-06-12 18:12:53 -07:00
parent fe67674809
commit b51f82f260
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

@ -10,6 +10,9 @@ PHP NEWS
. Implemented FR #67429 (CLI server is missing some new HTTP response codes). . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
(Adam) (Adam)
- Streams:
. Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam)
?? ??? 2014, PHP 5.4.30 ?? ??? 2014, PHP 5.4.30
- Core: - Core:

5
ext/standard/http_fopen_wrapper.c
View file

@ -736,10 +736,11 @@ finish:
SEPARATE_ZVAL(tmpzval); SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval); convert_to_long_ex(tmpzval);
follow_location = Z_LVAL_PP(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 /* we shouldn't redirect automatically
if follow_location isn't set and response_code not in (300, 301, 302, 303 and 307) 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; follow_location = 0;
} }
strlcpy(location, http_header_line + 10, sizeof(location)); 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