diff options
| author | Dan Kalowsky <kalowsky@php.net> | 2001-06-19 17:55:01 +0000 |
|---|---|---|
| committer | Dan Kalowsky <kalowsky@php.net> | 2001-06-19 17:55:01 +0000 |
| commit | a715a08dc8ab131584a97e87ba5fc20ecc7b55b2 (patch) | |
| tree | e33f88063fff0924a5bb47924e20e24af3d4ec61 | |
| parent | 9c9a3139297c2507111de293de0d7bf8bc0a1068 (diff) | |
| download | php-git-a715a08dc8ab131584a97e87ba5fc20ecc7b55b2.tar.gz | |
Ends memory leak in PHP when using Solid DB systems. Thanks to Eric Veldhuyzen.
| -rw-r--r-- | ext/odbc/php_odbc.c | 4 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 6fee2a6f42..35b2d0c8b7 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -97,7 +97,9 @@ function_entry odbc_functions[] = { PHP_FE(odbc_field_type, NULL) PHP_FE(odbc_field_num, NULL) PHP_FE(odbc_free_result, NULL) +#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) PHP_FE(odbc_next_result, NULL) +#endif PHP_FE(odbc_num_fields, NULL) PHP_FE(odbc_num_rows, NULL) PHP_FE(odbc_result, NULL) @@ -2231,6 +2233,7 @@ PHP_FUNCTION(odbc_num_rows) } /* }}} */ +#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) /* {{{ proto bool next_result(int result_id) Checks if multiple results are avaiable */ PHP_FUNCTION(odbc_next_result) @@ -2278,6 +2281,7 @@ PHP_FUNCTION(odbc_next_result) } } /* }}} */ +#endif /* {{{ proto int odbc_num_fields(int result_id) Get number of columns in a result */ diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h index 32259086c0..9aa48bcfec 100644 --- a/ext/odbc/php_odbc.h +++ b/ext/odbc/php_odbc.h @@ -217,7 +217,9 @@ PHP_FUNCTION(odbc_field_name); PHP_FUNCTION(odbc_field_type); PHP_FUNCTION(odbc_field_num); PHP_FUNCTION(odbc_free_result); +#if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30) PHP_FUNCTION(odbc_next_result); +#endif PHP_FUNCTION(odbc_num_fields); PHP_FUNCTION(odbc_num_rows); PHP_FUNCTION(odbc_prepare); |