Merge branch 'PHP-5.3' into PHP-5.4

diff --cc NEWS
index 5e482d2b2b98077c49739779e7d729a413f08a06,69cbb2a0fa58a1c7c0e3614211b0084375ebe9f9..b7753d68dd224e16ef4971ab13f6632c69d850c9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,30 -1,22 +1,31 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2012, PHP 5.3.16
 +?? ??? 2012, PHP 5.4.7
  
  - Core:
 -  . Fixed bug #62763 (register_shutdown_function and extending class). 
+   . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
 +  . Fixed bug #62844 (parse_url() does not recognize //). (Andrew Faulds).
 +  . Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not 
 +    set). (Felipe)
 +  . Fixed bug #62763 (register_shutdown_function and extending class).
      (Laruence)
 +  . Fixed bug #62725 (Calling exit() in a shutdown function does not return
 +    the exit value). (Laruence)
    . Fixed bug #62744 (dangling pointers made by zend_disable_class). (Laruence)
 -  . Fixed bug #62716 (munmap() is called with the incorrect length). 
 +  . Fixed bug #62716 (munmap() is called with the incorrect length).
      (slangley@google.com)
 -  . Fixed bug ##62460 (php binaries installed as binary.dSYM). (Reeze Xia)
 -  . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
 -    with run-test.php). (Laruence)
 +  . Fixed bug #62358 (Segfault when using traits a lot). (Laruence)
 +  . Fixed bug #62328 (implementing __toString and a cast to string fails)
 +    (Laruence)
 +  . Fixed bug #51363 (Fatal error raised by var_export() not caught by error 
 +    handler). (Lonny Kapelushnik)
 +  . Fixed bug #40459 (Stat and Dir stream wrapper methods do not call 
 +    constructor). (Stas)
  
  - CURL:
 +  . Fixed bug #62912 (CURLINFO_PRIMARY_* AND CURLINFO_LOCAL_* not exposed).
 +      (Pierrick)
    . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick)
 -  . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false).
 -    (r.hampartsumyan@gmail.com, Laruence)
  
  - DateTime:
    . Fixed bug #62852 (Unserialize invalid DateTime causes crash).

diff --cc Zend/zend_vm_execute.skl
index 426f689795fc94780ed01a14ea82f836159b93ba,e5a143eaa79c7d0d6a07ef72c3b83f13f244febe..6d1b2e70e7d02669a5faecf23ed7478871db4bbd
--- 1/Zend/zend_vm_execute.skl
--- 2/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@@ -2,11 -2,10 +2,11 @@@
  
  ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
  {
 +      DCL_OPLINE
        zend_execute_data *execute_data;
        zend_bool nested = 0;
-       zend_bool original_in_execution = EG(in_execution);
        {%HELPER_VARS%}
+       {%EXECUTION_STATUS%}
  
        {%INTERNAL_LABELS%}
  

diff --cc Zend/zend_vm_gen.php
Simple merge