Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Replace invalid code with a proper #error

diff --cc NEWS
index 8b833370114cff11322ed81410c4e17150492c8f,ebdf31514e3348b301e33b33f0a398a938b2d4cf..0d6edf25c77caafac48ff5ca86daf387d647efee
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -4,10 -4,7 +4,11 @@@ PH
  
  - Core:
    . Added validation of class names in the autoload process. (Dmitry)
+   . Fixed invalid C code in zend_strtod.c. (Lior Kaplan)
 +  . Fixed bug #66041 (list() fails to unpack yielded ArrayAccess object).
 +    (Nikita)
 +  . Fixed bug #65764 (generators/throw_rethrow FAIL with
 +    ZEND_COMPILE_EXTENDED_INFO). (Nikita)
    . Fixed bug #61645 (fopen and O_NONBLOCK). (Mike)
  
  - Date: