Merge branch 'PHP-5.3' into PHP-5.4

diff --cc NEWS
index ceb1ad031078e1b0dfce9a48a45c2f6ad2e02ee5,1658cdbd7ae14405720254a5f89d58688dd7c987..f3e3f9cb74fb8fd633e0e0eecdb952dbae4c9bfa
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -81,14 -51,33 +81,18 @@@ PH
    . Fixed bug #61194 (PDO should export compression flag with myslqnd).
      (Johannes)
  
 -- PDO_odbc 
 +- PDO_odbc
    . Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). (Ilia)
  
 -- PDO_pgsql
 -  . Fixed bug #61267 (pdo_pgsql's PDO::exec() returns the number of SELECTed
 -    rows on postgresql >= 9). (ben dot pineau at gmail dot com)
 -
 -- PDO_Sqlite extension:
 -  . Add createCollation support. (Damien)
 -
 -- Phar:
 +- Phar
    . Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
 -    bytes). (Nikic)
 -
 -- PHP-FPM SAPI:
 -  . Fixed bug #60811 (php-fpm compilation problem). (rasmus)
 +    bytes). (Nikita Popov)
  
 -  . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
 -    (Nikic, Laruence)
+ - Readline:
+   . Add open_basedir checks to readline_write_history and readline_read_history.
+     (Rasmus, reported by Mateusz Goik)
+ 
  - Reflection:
 -  . Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
 -    when get_properties returns a hash table with (inaccessible) dynamic
 -    numeric properties). (Gustavo)
    . Fixed bug #60968 (Late static binding doesn't work with 
      ReflectionMethod::invokeArgs()). (Laruence)
  

diff --cc ext/standard/link.c
Simple merge