Merge branch 'PHP-5.3' into PHP-5.4

diff --cc NEWS
index 2a4b66e23fdf17a336d2ecbd6abca5d6203117f4,68a88ed08c4205bde0a6b542ff0201ba79f8790b..383950e04d10ade603be3166d530084e604956a6
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,27 -1,24 +1,30 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2012, PHP 5.3.20
 +?? ??? 2012, PHP 5.4.10
  
 -- Zend Engine:
 +- Core:
    . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
 -  . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes 
 -    from value). (Pierrick)
    . Fixed bug #63468 (wrong called method as callback with inheritance).
      (Laruence)
 +  . Fixed bug #61557 (Crasher in tt-rss backend.php).
 +    (i dot am dot jack dot mail at gmail dot com)
 +  . Fixed bug #61272 (ob_start callback gets passed empty string).
 +    (Mike, casper at langemeijer dot eu)
  
 -- Core:
 -  . Fixed bug #63451 (config.guess file does not have AIX 7 defined, 
 -    shared objects are not created). (kemcline at au1 dot ibm dot com)
 +- Imap:
 +  . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
  
 -- Apache2 Handler SAPI:
 -  . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
 +- Json:
 +  . Fixed bug #63588 use php_next_utf8_char and remove duplicate
 +    implementation. (Remi)
 +
 +- mysqli:
 +  . Fixed bug #63361 missing header. (Remi)
 +
++- MySQLnd:
++  . Fixed bug #63398 (Segfault when polling closed link). (Laruence)
+ 
  - Fileinfo:
 -  . Fixed bug #63248 (Load multiple magic files from a directory under Windows).
 -    (Anatoliy)
    . Fixed bug #63590 (Different results in TS and NTS under Windows).
      (Anatoliy)
  

diff --cc ext/mysqli/mysqli_nonapi.c
Simple merge