]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Thu, 11 Jun 2015 22:27:31 +0000 (00:27 +0200)
committerMatteo Beccati <mbeccati@php.net>
Thu, 11 Jun 2015 22:27:31 +0000 (00:27 +0200)
commitcd5b7e968801ad2df0576cdc3273d2847590ad30
treec2476789dd9eda896aff53f49f2c91816325ffc9
parent9692e74b04eacf7a46f65df8db3eef34e695dba9
parentafa4c3e7c72a616d21780fd39764f7fc03d0a3df
Merge branch 'PHP-5.6'

* PHP-5.6:
  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
win32/install.txt
ext/pdo_pgsql/pgsql_driver.c