]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Fri, 12 Jun 2015 00:07:02 +0000 (02:07 +0200)
committerMatteo Beccati <mbeccati@php.net>
Fri, 12 Jun 2015 00:07:02 +0000 (02:07 +0200)
* PHP-5.5:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
ext/pdo_pgsql/pgsql_driver.c

1  2 
NEWS
ext/pdo_pgsql/pgsql_statement.c

diff --cc NEWS
Simple merge
Simple merge