]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 08:54:06 +0000 (09:54 +0100)
committerMatteo Beccati <mbeccati@php.net>
Mon, 5 Jan 2015 09:48:18 +0000 (10:48 +0100)
commit488d3dac2e7d77223efb3bd4748e14e5b6be0156
tree14943cb9cc0465d5258fe91daf323461a414773f
parent95183cc33918efe39098fa4adb3b3b13eaa1eee7
parent7d2f8525d8ec1612ad3999076e291e734fcb0568
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
ext/pdo_mysql/mysql_driver.c
ext/pdo_pgsql/pgsql_driver.c
ext/pdo_pgsql/tests/bug68371.phpt