tony2001 Tue May 10 19:15:07 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/pgsql pgsql.c
Log:
use & and check for the right value of result_type
btw, nobody noticed that result_type wasn't ever working in 4.3, because it
was absent in parse_params()..
also, I prefer "Tony" just for uniformity =)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.900&r2=1.1247.2.901&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.900 php-src/NEWS:1.1247.2.901
--- php-src/NEWS:1.1247.2.900 Tue May 10 17:47:11 2005
+++ php-src/NEWS Tue May 10 19:15:05 2005
@@ -10,7 +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). (Antony)
+- Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony)
- 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)
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.244.2.39&r2=1.244.2.40&ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.39
php-src/ext/pgsql/pgsql.c:1.244.2.40
--- php-src/ext/pgsql/pgsql.c:1.244.2.39 Tue May 10 16:14:11 2005
+++ php-src/ext/pgsql/pgsql.c Tue May 10 19:15:06 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.244.2.39 2005/05/10 20:14:11 tony2001 Exp $ */
+/* $Id: pgsql.c,v 1.244.2.40 2005/05/10 23:15:06 tony2001 Exp $ */
#include <stdlib.h>
@@ -3125,12 +3125,17 @@
PGnotify *pgsql_notify;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, "r|l",
- &pgsql_link)
== FAILURE) {
+ &pgsql_link,
&result_type) == FAILURE) {
RETURN_FALSE;
}
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL
link", le_link, le_plink);
+ if (!(result_type & PGSQL_BOTH)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid result
type");
+ RETURN_FALSE;
+ }
+
PQconsumeInput(pgsql);
pgsql_notify = PQnotifies(pgsql);
if (!pgsql_notify) {
@@ -3138,11 +3143,11 @@
RETURN_FALSE;
}
array_init(return_value);
- if (result_type == PGSQL_NUM || result_type == PGSQL_BOTH) {
+ if (result_type & PGSQL_NUM) {
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 || result_type == PGSQL_BOTH) {
+ if (result_type & PGSQL_ASSOC) {
add_assoc_string(return_value, "message",
pgsql_notify->relname, 1);
add_assoc_long(return_value, "pid", pgsql_notify->be_pid);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
