From: Stanislav Malyshev <stas@php.net>
Date: Sun, 8 Dec 2013 23:50:08 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.8RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=744f35d2ab9d5ef5ebb0276aa1b3fc0ceb872087;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

744f35d2ab9d5ef5ebb0276aa1b3fc0ceb872087
diff --cc NEWS
index 8b83337011,ebdf31514e..0d6edf25c7
--- a/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: