Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names

diff --cc ext/pdo_mysql/mysql_driver.c
Simple merge

diff --cc ext/pdo_pgsql/pgsql_driver.c
index c2f744f0d5391ac73a92be100840cc29c192f898,5a78abfb613a5d0f2740b3fbacf1412091225006..ce8f678454df6b8a4b2a03db5df6521e8ed20052
--- 1/ext/pdo_pgsql/pgsql_driver.c
--- 2/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@@ -382,8 -379,17 +382,17 @@@ static int pdo_pgsql_get_attribute(pdo_
        pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
  
        switch (attr) {
+               case PDO_ATTR_EMULATE_PREPARES:
+                       ZVAL_BOOL(return_value, H->emulate_prepares);
+                       break;
+ 
+               case PDO_PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT:
+                       php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT is deprecated, use PDO::ATTR_EMULATE_PREPARES instead");
+                       ZVAL_BOOL(return_value, H->disable_native_prepares);
+                       break;
+ 
                case PDO_ATTR_CLIENT_VERSION:
 -                      ZVAL_STRING(return_value, PG_VERSION, 1);
 +                      ZVAL_STRING(return_value, PG_VERSION);
                        break;
  
                case PDO_ATTR_SERVER_VERSION: