Merge branch 'PHP-5.3' into PHP-5.4

diff --cc NEWS
index 99a30c81c91bec7f57a3a525b65c90dd9bee60e8,a6e05be56856923efc19694c528a61992a836b04..97cb3d0fad3f8e5d681c20a50e1b076e03374feb
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,33 -1,26 +1,35 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2012, PHP 5.3.16
 +?? ??? 2012, PHP 5.4.8
 +
 +?? ??? 2012, PHP 5.4.7
  
  - Core:
+   . Fixed bug #62976 (Notice: could not be converted to int when comparing
+     some builtin classes). (Laruence)
    . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
 -  . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" 
 -    Windows registry). (aserbulov at parallels dot com)
 -  . Fixed bug #62763 (register_shutdown_function and extending class). 
 +  . 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_operators.c
Simple merge