summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Kalowsky <kalowsky@php.net>2001-03-27 14:17:52 +0000
committerDan Kalowsky <kalowsky@php.net>2001-03-27 14:17:52 +0000
commit0d7729ed58abf84184267eb5ce281befb3e39c09 (patch)
tree28b5a3f05ded9238135447582148d8dec4955150
parent8c97f5c04d4eda6187151665f56412f40ff81c8c (diff)
downloadphp-git-0d7729ed58abf84184267eb5ce281befb3e39c09.tar.gz
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.
-rw-r--r--ext/odbc/php_odbc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 50f7b60be0..164eaa3961 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2157,15 +2157,15 @@ PHP_FUNCTION(odbc_close)
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;
}