diff options
| author | Jani Taskinen <jani@php.net> | 2009-07-20 10:54:37 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-07-20 10:54:37 +0000 |
| commit | bed030176afd5f783669b8aba4c5b8fd74f9ce3b (patch) | |
| tree | d9540bb415aef07867e8935dc582990e7570282d | |
| parent | ae7a6f9c4d028501c874f524a0f7ea09fcb84df2 (diff) | |
| download | php-git-bed030176afd5f783669b8aba4c5b8fd74f9ce3b.tar.gz | |
Fixed bug #48929 (Double \r\n after HTTP headers when "header" context option is an array)
| -rw-r--r-- | ext/standard/http_fopen_wrapper.c | 3 | ||||
| -rw-r--r-- | ext/standard/tests/http/bug48929.phpt | 56 |
2 files changed, 58 insertions, 1 deletions
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 474032107d..c36f75b4c4 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -391,7 +391,8 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, } } smart_str_0(&tmpstr); - tmp = tmpstr.c; + /* Remove newlines and spaces from start and end. there's at least one extra \r\n at the end that needs to go. */ + tmp = php_trim(tmpstr.c, strlen(tmpstr.c), NULL, 0, NULL, 3 TSRMLS_CC); } if (Z_TYPE_PP(tmpzval) == IS_STRING && Z_STRLEN_PP(tmpzval)) { /* Remove newlines and spaces from start and end php_trim will estrndup() */ diff --git a/ext/standard/tests/http/bug48929.phpt b/ext/standard/tests/http/bug48929.phpt new file mode 100644 index 0000000000..ee816fe427 --- /dev/null +++ b/ext/standard/tests/http/bug48929.phpt @@ -0,0 +1,56 @@ +--TEST-- +Bug #: duplicate \r\n sent after last header line +--SKIPIF-- +<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?> +--FILE-- +<?php +require 'server.inc'; + +function do_test($context_options) { + + $context = stream_context_create(array('http' => $context_options)); + + $responses = array( + "data://text/plain,HTTP/1.0 200 OK\r\n\r\n", + ); + + $pid = http_server("tcp://127.0.0.1:12342", $responses, $output); + + foreach($responses as $r) { + + $fd = fopen('http://127.0.0.1:12342/', 'rb', false, $context); + + fseek($output, 0, SEEK_SET); + var_dump(stream_get_contents($output)); + fseek($output, 0, SEEK_SET); + } + + http_server_kill($pid); +} + +echo "-- Test: requests with 'header' as array --\n"; + +do_test(array('header' => array('X-Foo: bar', 'Content-Type: text/plain'), 'method' => 'POST', 'content' => 'ohai')); + +echo "-- Test: requests with 'header' as string --\n"; + +do_test(array('header' => "X-Foo: bar\r\nContent-Type: text/plain", 'method' => 'POST', 'content' => 'ohai')); + +?> +--EXPECT-- +-- Test: requests with 'header' as array -- +string(103) "POST / HTTP/1.0 +Host: 127.0.0.1:12342 +Content-Length: 4 +X-Foo: bar +Content-Type: text/plain + +ohai" +-- Test: requests with 'header' as string -- +string(103) "POST / HTTP/1.0 +Host: 127.0.0.1:12342 +Content-Length: 4 +X-Foo: bar +Content-Type: text/plain + +ohai" |