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

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

diff --cc sapi/cli/php_cli_server.c
Simple merge