cvs: php4 /ext/odbc php_odbc.c

kalowsky Tue Mar 27 06:17:53 2001 EDT Modified files: /php4/ext/odbc php_odbc.c Log: Fix for Bug #9272, as submitted by marc boeren (m.boeren@guidance.nl). Applied by me, due to apparently a lack of cvs access to ext/odbc for him. Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.73 php4/ext/odbc/php_odbc.c:1.74 --- php4/ext/odbc/php_odbc.c:1.73 Fri Mar 9 15:44:55 2001 +++ php4/ext/odbc/php_odbc.c Tue Mar 27 06:17:52 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.73 2001/03/09 23:44:55 fmk Exp $ */ +/* $Id: php_odbc.c,v 1.74 2001/03/27 14:17:52 kalowsky Exp $ */ #include "php.h" #include "php_globals.h" @@ -2157,15 +2157,15 @@ int i; int type; int is_pconn = 0; + int found_resource_type = le_conn; ODBCLS_FETCH(); if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) { WRONG_PARAM_COUNT; } - conn = (odbc_connection *) zend_fetch_resource(pv_conn, -1, "ODBC-Link", NULL, 1, le_conn); - if(!conn){ - ZEND_FETCH_RESOURCE(conn, odbc_connection *, pv_conn, -1, "ODBC-Link", le_pconn); + conn = (odbc_connection *) zend_fetch_resource(pv_conn, -1, "ODBC-Link", found_resource_type, 2, le_conn, le_pconn); + if (found_resource_type==le_pconn) { is_pconn = 1; }