Fixed bug #48929 (Double \r\n after HTTP headers when "header" context option is...

diff --git a/NEWS b/NEWS
index 04a64171dfd9aa3e8f5ffd844be82b4e632d7be3..608f867762d433213f4fbb31467521c3909af516 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ PHP                                                                        NEWS
   defined as a file handle. (Ilia)
 
 - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe)
+- Fixed bug #48929 (Double \r\n after HTTP headers when "header" context
+  option is an array). (David Zülke)
 - Fixed bug #48913 (Too long error code strings in pdo_odbc driver).
   (naf at altlinux dot ru, Felipe)
 - Fixed bug #48788 (RecursiveDirectoryIterator doesn't descend into symlinked

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index b983f146e0a44c07f4d044f6db8084b82adeeb50..64981682b0c56f2a305c7eb3d7fe072dd0338427 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -347,7 +347,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 (file)
index 0000000..ee816fe
--- /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"