tony2001 Tue May 10 16:14:13 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/pgsql pgsql.c /php-src NEWS Log: MFH: fix #32904 (pg_get_notify() ignores result_type parameter) http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.244.2.38&r2=1.244.2.39&ty=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.244.2.38 php-src/ext/pgsql/pgsql.c:1.244.2.39 --- php-src/ext/pgsql/pgsql.c:1.244.2.38 Wed Apr 13 18:12:06 2005 +++ php-src/ext/pgsql/pgsql.c Tue May 10 16:14:11 2005 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.244.2.38 2005/04/13 22:12:06 tony2001 Exp $ */ +/* $Id: pgsql.c,v 1.244.2.39 2005/05/10 20:14:11 tony2001 Exp $ */ #include <stdlib.h> @@ -3138,11 +3138,11 @@ 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); } http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.898&r2=1.1247.2.899&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.898 php-src/NEWS:1.1247.2.899 --- php-src/NEWS:1.1247.2.898 Tue May 10 09:21:35 2005 +++ php-src/NEWS Tue May 10 16:14:11 2005 @@ -10,6 +10,7 @@ - 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)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php