File tree 2 files changed +9
-11
lines changed
2 files changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -545,7 +545,6 @@ PHP_MINIT_FUNCTION(odbc)
545
545
/* {{{ PHP_RINIT_FUNCTION */
546
546
PHP_RINIT_FUNCTION (odbc )
547
547
{
548
- ODBCG (defConn ) = -1 ;
549
548
ODBCG (num_links ) = ODBCG (num_persistent );
550
549
memset (ODBCG (laststate ), '\0' , 6 );
551
550
memset (ODBCG (lasterrormsg ), '\0' , SQL_MAX_MESSAGE_LENGTH );
Original file line number Diff line number Diff line change 187
187
#endif
188
188
189
189
typedef struct odbc_connection {
190
- ODBC_SQL_ENV_T henv ;
191
- ODBC_SQL_CONN_T hdbc ;
192
- char laststate [6 ];
193
- char lasterrormsg [SQL_MAX_MESSAGE_LENGTH ];
190
+ ODBC_SQL_ENV_T henv ;
191
+ ODBC_SQL_CONN_T hdbc ;
192
+ char laststate [6 ];
193
+ char lasterrormsg [SQL_MAX_MESSAGE_LENGTH ];
194
194
HashTable results ;
195
195
} odbc_connection ;
196
196
@@ -239,12 +239,11 @@ ZEND_BEGIN_MODULE_GLOBALS(odbc)
239
239
zend_long max_links ;
240
240
zend_long num_persistent ;
241
241
zend_long num_links ;
242
- int defConn ;
243
- zend_long defaultlrl ;
244
- zend_long defaultbinmode ;
245
- zend_long default_cursortype ;
246
- char laststate [6 ];
247
- char lasterrormsg [SQL_MAX_MESSAGE_LENGTH ];
242
+ zend_long defaultlrl ;
243
+ zend_long defaultbinmode ;
244
+ zend_long default_cursortype ;
245
+ char laststate [6 ];
246
+ char lasterrormsg [SQL_MAX_MESSAGE_LENGTH ];
248
247
/* Stores ODBC links throughout the duration of a request. The connection member may be either persistent or
249
248
* non-persistent. In the former case, it is a pointer to an item in EG(persistent_list). This solution makes it
250
249
* possible to properly free links during RSHUTDOWN (or when they are explicitly closed), while persistent
You can’t perform that action at this time.
0 commit comments