Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:28062
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain chiaraquartet.net from 66.79.163.178 cause and error)
Message-ID: <45D6838C.6030905@chiaraquartet.net>
Date: Fri, 16 Feb 2007 22:24:44 -0600
User-Agent: Thunderbird 1.5.0.9 (X11/20070104)
MIME-Version: 1.0
To: internals Mailing List <internals@lists.php.net>
Content-Type: multipart/mixed;
 boundary="------------060909050605020608080006"
Subject: new test for php://input and patch for small flaw in run-tests.php
From: greg@chiaraquartet.net (Gregory Beaver)

--------------060909050605020608080006
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Hi all,

While porting improvements of run-tests.php into the pear run-tests
command, I noticed that there are no tests for the php://input stream in
PHP_5_2 (didn't look at HEAD yet), so I thought I would offer one if it
is useful.

At the same time, I found a flaw in the implementation of POST_RAW,
patch attached.  Basically, \n is appended to all lines including the
last line.  The patch corrects this by appending \n to all but the last
line so there is no trailing whitespace.

Here's the new test:

--TEST--
php://input
--SKIPIF--
<?php if (php_sapi_name()=='cli') die('skip'); ?>
--POST_RAW--
Content-Type: application/x-www-form-urlencoded
userid=joe&password=guessme
--FILE--
<?php
var_dump($_FILES);
var_dump($_POST);
$fp = fopen('php://input', 'r');
$a = fread($fp, 8192);
fclose($fp);
var_dump($a);
?>
--EXPECT--
array(0) {
}
array(2) {
  ["userid"]=>
  string(3) "joe"
  ["password"]=>
  string(7) "guessme"
}
string(27) "userid=joe&password=guessme"

--------------060909050605020608080006
Content-Type: text/plain;
 name="run-tests.oops.patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="run-tests.oops.patch.txt"

Index: run-tests.php
===================================================================
RCS file: /repository/php-src/run-tests.php,v
retrieving revision 1.226.2.37.2.23
diff -u -r1.226.2.37.2.23 run-tests.php
--- run-tests.php	8 Feb 2007 15:22:03 -0000	1.226.2.37.2.23
+++ run-tests.php	17 Feb 2007 04:22:32 -0000
@@ -1300,12 +1300,15 @@
 		$raw_lines = explode("\n", $post);
 
 		$request = '';
+		$started = false;
 		foreach ($raw_lines as $line) {
 			if (empty($env['CONTENT_TYPE']) && preg_match('/^Content-Type:(.*)/i', $line, $res)) {
 				$env['CONTENT_TYPE'] = trim(str_replace("\r", '', $res[1]));
 				continue;
 			}
-			$request .= $line . "\n";
+			if ($started) $request .= "\n";
+			$started = true;
+			$request .= $line;
 		}
 
 		$env['CONTENT_LENGTH'] = strlen($request);

--------------060909050605020608080006--