From: Matteo Beccati <mbeccati@php.net>
Date: Fri, 17 Oct 2014 14:23:25 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~104^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9935bf7df70d8fcfa9ef5c2f47e1d760ffc3f666;p=php

Merge branch 'PHP-5.6'

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

9935bf7df70d8fcfa9ef5c2f47e1d760ffc3f666
diff --cc ext/pdo_pgsql/pgsql_driver.c
index 327d70218b,657218d00e..b3a9634c6f
--- a/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);