From: Adam Harvey <aharvey@php.net>
Date: Mon, 9 Sep 2013 23:32:16 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.4~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b6270271ea0b707c69c80d7c41886b125af925c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Handle CLI server request headers case insensitively.
  5.4.21 now

Conflicts:
	configure.in
	main/php_version.h
---

8b6270271ea0b707c69c80d7c41886b125af925c
diff --cc NEWS
index 865557198e,e05b24042b..73214b3506
--- a/NEWS
+++ b/NEWS
@@@ -1,8 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.21
 +?? ??? 2013, PHP 5.5.5
  
+ - CLI server:
+   . Fixed bug #65633 (built-in server treat some http headers as
+     case-sensitive). (Adam)
+ 
 -?? ??? 2013, PHP 5.4.20
 +?? ??? 2013, PHP 5.5.4
  
  - Core:
    . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).