Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_compile.c

diff --cc NEWS
index b2cb8c2eca035b6cf9317da0b5fcb0fb714edcda,567c81bd2c58cff5bbbf6abd5c41d778e0d31efa..757e9185f61805378156acfceb0af200c4ca31bb
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,22 -1,13 +1,23 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.17
 +?? ??? 2013, PHP 5.5.0 Release Candidate 4
  
  - Core:
+   . Fixed bug #64988 (Class loading order affects E_STRICT warning). (Laruence)
    . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence)
 -  . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence)
    . Fixed bug #64934 (Apache2 TS crash with get_browser()). (Anatol)
  
 +- SPL:
 +  . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on
 +    64-bits systems). (Laruence)
 +
 +06 Jun 2013, PHP 5.5.0 Release Candidate 3
 +
 +- Core:
 +  . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence)
 +  . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode,
 +    CVE 2013-2110). (Stas)
 +
  - FPM:
    . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi)
  

diff --cc Zend/zend_compile.c
index 8674f924713cec7c3a338417d448527993e78669,ab6020c623b6af3cc3fe790924f23aa3f65c9da1..a2aa909f154e9cfb0756aac351a8ffcd7f677f61
--- 1/Zend/zend_compile.c
--- 2/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -3464,12 -3267,12 +3464,12 @@@ static void do_inheritance_check_on_met
  
        if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
                if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
-                       zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC));
 -                      zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype TSRMLS_CC)); 
++                      zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype TSRMLS_CC));
                }
        } else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
                if (!zend_do_perform_implementation_check(child, parent TSRMLS_CC)) {
-                       char *method_prototype = zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC);
+                       char *method_prototype = zend_get_function_declaration(parent TSRMLS_CC);
 -                      zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype); 
 +                      zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype);
                        efree(method_prototype);
                }
        }