Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update header handling to RFC 7230

diff --cc NEWS
index dd20fa9bd7254ae144f1c8ba23e09eee7ffe55a2,462d6a1733ac8d28f6c76d10fa610ede65a36333..06825f50d2f27edb5086fe90d758bed98f27804e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,15 -1,10 +1,17 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 20?? PHP 5.4.38
 +?? ??? 2015, PHP 5.5.23
 +
 +
 +?? ??? 2015, PHP 5.5.22
  
  - Core:
+   . Removed support for multi-line headers, as the are deprecated by RFC 7230.
+     (Stas)
 +  . Fixed bug #68986 (pointer returned by php_stream_fopen_temporary_file
 +    not validated in memory.c). (nayana at ddproperty dot com)
 +  . Fixed bug #67068 (getClosure returns somethings that's not a closure). 
 +    (Danack at basereality dot com)
    . Fixed bug #68925 (Mitigation for CVE-2015-0235 – GHOST: glibc gethostbyname
      buffer overflow). (Stas)
  

diff --cc main/SAPI.c
Simple merge