Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Added HTTP codes as of RFC 6585

diff --cc NEWS
index 90a0982c308ec0c06f7a8cccf63147554728619a,02e8d64d5e4d6d4d395f37a28c22ec6946ddda8d..2cabbbee521fd0d1fd0c56cd7ded9ac0c1711023
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,18 -1,10 +1,19 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2012, PHP 5.4.13
 +?? ??? 201?, PHP 5.5.0 Beta 1
  
  - Core:
+   . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell)
 +  . Fixed bug #64135 (Exceptions from set_error_handler are not always
 +    propagated). (Laruence)
 +  . Fixed bug #63830 (Segfault on undefined function call in nested generator).
 +    (Nikita Popov)
 +  . Fixed bug #60833 (self, parent, static behave inconsistently 
 +    case-sensitive). (Stas, mario at include-once dot org)
 +  . Implemented FR #60524 (specify temp dir by php.ini). (ALeX Kazik).
    . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
 +  . Added ARMv7/v8 versions of various Zend arithmetic functions that are
 +    implemented using inline assembler (Ard Biesheuvel)
  
  - CLI server:
    . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi)

diff --cc sapi/cgi/cgi_main.c
Simple merge

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