From: Adam Harvey <aharvey@php.net>
Date: Mon, 7 Jul 2014 20:45:01 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~113^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70e9d3e2f9d7bc0b48811f01c084f82524af604c;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
---

70e9d3e2f9d7bc0b48811f01c084f82524af604c
diff --cc NEWS
index a717429605,afe5bb91ce..b5c9654117
--- a/NEWS
+++ b/NEWS
@@@ -7,8 -13,17 +7,12 @@@ PH
      generator). (Nikita)
    . Fixed bug #67151 (strtr with empty array crashes). (Nikita)
  
+ - CLI server:
 -  . Implemented FR #67429 (CLI server is missing some new HTTP response codes).
 -    (Adam)
+   . Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
+     (Adam)
+ 
 -- FPM:
 -  . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi)
 -
  - Intl:
 -  . Fixed bug #66921 (Wrong argument type hint for function 
 +  . Fixed bug #66921 (Wrong argument type hint for function
      intltz_from_date_time_zone). (Stas)
    . Fixed bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting).
      (Stas)
diff --cc sapi/cli/tests/bug66830.phpt
index 0000000000,68fcf21c11..58c07e031a
mode 000000,100644..100644
--- a/sapi/cli/tests/bug66830.phpt
+++ b/sapi/cli/tests/bug66830.phpt
@@@ -1,0 -1,43 +1,43 @@@
+ --TEST--
+ Bug #66830 (Empty header causes PHP built-in web server to hang)
+ --SKIPIF--
+ <?php
+ include "skipif.inc";
+ ?>
+ --FILE--
+ <?php
+ include "php_cli_server.inc";
+ php_cli_server_start(<<<'PHP'
+ header(' ');
+ PHP
+ );
+ 
+ list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+ $port = intval($port)?:80;
+ 
+ $fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+ if (!$fp) {
+   die("connect failed");
+ }
+ 
+ if(fwrite($fp, <<<HEADER
+ GET / HTTP/1.1
+ Host: {$host}
+ 
+ 
+ HEADER
+ )) {
+     while (!feof($fp)) {
+         echo fgets($fp);
+     }
+ }
+ 
+ fclose($fp);
+ ?>
+ --EXPECTF--
+ HTTP/1.1 200 OK
+ Host: %s
+ Connection: close
+ X-Powered-By: %s
 -Content-type: text/html
++Content-type: text/html; charset=UTF-8
+