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

diff --git a/NEWS b/NEWS
index 621bae335a69816a6619399280c3b92114e27f97..9b25b3245c48f20e3a3d683019b701fc81e8c7e8 100644 (file)
--- 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 6788a49234d3ad128ad01a8de2ec3b7fba8dc7b0..ca63c43d871ef8e7570db5c24a94e0277154a532 100644 (file)
--- 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);
        }