Hi there,
attached are patches for http://bugs.php.net/48929.
Big kudos to Tjerk Anne and Arnaud, this forking HTTP server stuff for
testing the stream wrapper is genius.
- David
Index: ext/standard/tests/http/bug48929.phpt
===================================================================
--- ext/standard/tests/http/bug48929.phpt (Revision 0)
+++ ext/standard/tests/http/bug48929.phpt (Revision 0)
@@ -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"
Index: ext/standard/http_fopen_wrapper.c
===================================================================
--- ext/standard/http_fopen_wrapper.c (Revision 283975)
+++ ext/standard/http_fopen_wrapper.c (Arbeitskopie)
@@ -391,7 +391,8 @@
}
}
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() */
Index: ext/standard/tests/http/bug48929.phpt
===================================================================
--- ext/standard/tests/http/bug48929.phpt (Revision 0)
+++ ext/standard/tests/http/bug48929.phpt (Revision 0)
@@ -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"
Index: ext/standard/http_fopen_wrapper.c
===================================================================
--- ext/standard/http_fopen_wrapper.c (Revision 283973)
+++ ext/standard/http_fopen_wrapper.c (Arbeitskopie)
@@ -347,7 +347,8 @@
}
}
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() */
Index: ext/standard/tests/http/bug48929.phpt
===================================================================
--- ext/standard/tests/http/bug48929.phpt (Revision 0)
+++ ext/standard/tests/http/bug48929.phpt (Revision 0)
@@ -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"
Index: ext/standard/http_fopen_wrapper.c
===================================================================
--- ext/standard/http_fopen_wrapper.c (Revision 283973)
+++ ext/standard/http_fopen_wrapper.c (Arbeitskopie)
@@ -348,7 +348,8 @@
}
}
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() */
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
