From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 25 Mar 2012 00:15:55 +0000 (+0530)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.1RC1~2^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b08b7fe78785230dd37e7969e38f1913727fbc88;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

b08b7fe78785230dd37e7969e38f1913727fbc88
diff --cc NEWS
index ceb1ad0310,1658cdbd7a..f3e3f9cb74
--- a/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)
  
+ - Readline:
 -  . Fixed bug #61088 (Memory leak in readline_callback_handler_install).
 -    (Nikic, Laruence)
+   . 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)