From: Antony Dovgal <tony2001@php.net>
Date: Tue, 10 May 2005 20:14:11 +0000 (+0000)
Subject: MFH: fix #32904 (pg_get_notify() ignores result_type parameter)
X-Git-Tag: php-4.4.0RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=180e1501bb1bd5bd3787ff7e2cf554a704486b8f;p=php

MFH: fix #32904 (pg_get_notify() ignores result_type parameter)
---

diff --git a/NEWS b/NEWS
index 621bae335a..9b25b3245c 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PHP 4                                                                      NEWS
 - Fixed bug #32974 (pcntl calls malloc() from a signal handler). (Wez)
 - Fixed bug #32936 (http redirects URLs are not checked for control chars). (Ilia)
 - Fixed bug #32932 (Oracle LDAP: ldap_get_entries invalid pointer). (Jani)
+- Fixed bug #32904 (pg_get_notify() ignores result_type parameter)
 - Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia)
 - Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
 - Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 6788a49234..ca63c43d87 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -3138,11 +3138,11 @@ PHP_FUNCTION(pg_get_notify)
 		RETURN_FALSE;
 	}
 	array_init(return_value);
-	if (result_type & (PGSQL_NUM|PGSQL_BOTH)) {
+	if (result_type == PGSQL_NUM || result_type == PGSQL_BOTH) {
 		add_index_string(return_value, 0, pgsql_notify->relname, 1);
 		add_index_long(return_value, 1, pgsql_notify->be_pid);
 	}
-	if (result_type & (PGSQL_ASSOC|PGSQL_BOTH)) {
+	if (result_type == PGSQL_ASSOC || result_type == PGSQL_BOTH) {
 		add_assoc_string(return_value, "message", pgsql_notify->relname, 1);
 		add_assoc_long(return_value, "pid", pgsql_notify->be_pid);
 	}