jani Mon, 20 Jul 2009 10:54:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284428
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c
A php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
A php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug48929.phpt
U php/php-src/trunk/ext/standard/http_fopen_wrapper.c
A php/php-src/trunk/ext/standard/tests/http/bug48929.phpt
Log:
Fixed bug #48929 (Double \r\n after HTTP headers when "header" context option
is an array)
Bug: http://bugs.php.net/48929 (Open)
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-07-20 10:51:40 UTC (rev 284427)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-07-20 10:54:37 UTC (rev 284428)
@@ -5,6 +5,8 @@
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
Modified: php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c 2009-07-20 10:51:40 UTC (rev 284427)
+++ php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c 2009-07-20 10:54:37 UTC (rev 284428)
@@ -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() */
Added: php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt 2009-07-20 10:54:37 UTC (rev 284428)
@@ -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"
Property changes on: php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug48929.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-20 10:51:40 UTC (rev 284427)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-20 10:54:37 UTC (rev 284428)
@@ -8,6 +8,8 @@
- Added support for proc_open()'s bypass_shell feature for Unix systems
(Gwynne, Nuno)
+- Fixed bug #48929 (Double \r\n after HTTP headers when "header" context
+ option is an array). (David Zülke)
- Fixed bug #48899 (is_callable returns true even if method does not exist in
parent class). (Felipe)
- Fixed bug #48893 (Problems compiling with Curl). (Felipe)
Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2009-07-20 10:51:40 UTC (rev 284427)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c 2009-07-20 10:54:37 UTC (rev 284428)
@@ -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() */
Added: php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug48929.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug48929.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug48929.phpt 2009-07-20 10:54:37 UTC (rev 284428)
@@ -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"
Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug48929.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c
===================================================================
--- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-07-20 10:51:40 UTC (rev 284427)
+++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-07-20 10:54:37 UTC (rev 284428)
@@ -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() */
Added: php/php-src/trunk/ext/standard/tests/http/bug48929.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/http/bug48929.phpt (rev 0)
+++ php/php-src/trunk/ext/standard/tests/http/bug48929.phpt 2009-07-20 10:54:37 UTC (rev 284428)
@@ -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"
Property changes on: php/php-src/trunk/ext/standard/tests/http/bug48929.phpt
___________________________________________________________________
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
