From: Stanislav Malyshev <stas@php.net>
Date: Mon, 17 Jun 2013 07:15:59 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69d187de02f771cae6c1a029ffd9a1b3b09d59d4;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library
---

69d187de02f771cae6c1a029ffd9a1b3b09d59d4
diff --cc NEWS
index d10d3f69d2,70188f5a56..e56e6f6926
--- a/NEWS
+++ b/NEWS
@@@ -18,6 -24,21 +18,10 @@@ PH
    . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to 
      the same db server). (Laruence)
  
 -- PDO_DBlib:
 -  . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib). 
 -    (Stanley Sufficool)
 -  . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley 
 -    Sufficool)
 -  . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed 
 -    statement crashes). (Stanley Sufficool)
 -
 -- PDO_pgsql:
 -  . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi)
 -
+ - Readline:
 -  . Implement FR #55694 (Expose additional readline variable to prevent 
++  . Implement FR #55694 (Expose additional readline variable to prevent
+     default filename completion). (Hartmel)
+ 
  - SPL:
    . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on
      64-bits systems). (Laruence)