Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
  News entry for new curl constants

diff --cc ext/pdo_pgsql/pgsql_driver.c
index 327d70218b8d939dbdec661cc4c8c84696947ce4,657218d00e32c4c5409632bc27f3fdc3d019b509..b3a9634c6f158fd42eddb3866ee0312b43e73ea0
--- 1/ext/pdo_pgsql/pgsql_driver.c
--- 2/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@@ -1059,12 -1056,18 +1059,18 @@@ static PHP_METHOD(PDO, pgsqlGetNotify
  
        array_init(return_value);
        if (result_type == PDO_FETCH_NUM || result_type == PDO_FETCH_BOTH) {
 -              add_index_string(return_value, 0, pgsql_notify->relname, 1);
 +              add_index_string(return_value, 0, pgsql_notify->relname);
                add_index_long(return_value, 1, pgsql_notify->be_pid);
+               if (pgsql_notify->extra && pgsql_notify->extra[0]) {
+                       add_index_string(return_value, 2, pgsql_notify->extra, 1);
+               }
        }
        if (result_type == PDO_FETCH_ASSOC || result_type == PDO_FETCH_BOTH) {
 -              add_assoc_string(return_value, "message", pgsql_notify->relname, 1);
 +              add_assoc_string(return_value, "message", pgsql_notify->relname);
                add_assoc_long(return_value, "pid", pgsql_notify->be_pid);
+               if (pgsql_notify->extra && pgsql_notify->extra[0]) {
+                       add_assoc_string(return_value, "payload", pgsql_notify->extra, 1);
+               }
        }
  
        PQfreemem(pgsql_notify);