cvs: php4 /ext/oci8 oci8.c php_oci8.h
| From: | Thies C. Arntzen | Date: | Sat, 15 Jul 2000 14:54:04 +0000 |
| Subject: | cvs: php4 /ext/oci8 oci8.c php_oci8.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-773@lists.php.net to get a copy of this message | ||
thies Sat Jul 15 07:54:04 2000 EDT
Modified files:
/php4/ext/oci8 oci8.c php_oci8.h
Log:
fixed uninitilized var in ZTS mode.
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.89 php4/ext/oci8/oci8.c:1.90
--- php4/ext/oci8/oci8.c:1.89 Mon Jul 3 08:05:46 2000
+++ php4/ext/oci8/oci8.c Sat Jul 15 07:54:04 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.89 2000/07/03 15:05:46 thies Exp $ */
+/* $Id: oci8.c,v 1.90 2000/07/15 14:54:04 thies Exp $ */
/* TODO list:
*
@@ -317,8 +317,7 @@
static void php_oci_init_globals(OCILS_D)
{
- OCI(user_num) = 1000;
- OCI(server_num) = 2000;
+ OCI(shutdown) = 0;
OCI(user) = malloc(sizeof(HashTable));
zend_hash_init(OCI(user), 13, NULL, NULL, 1);
@@ -468,8 +467,6 @@
PHP_RSHUTDOWN_FUNCTION(oci)
{
- OCILS_FETCH();
-
oci_debug("START php_rshutdown_oci");
#if 0
@@ -700,8 +697,6 @@
static void
_oci_server_list_dtor(oci_server *server)
{
- ELS_FETCH();
-
if (server->persistent)
return;
@@ -2955,8 +2950,6 @@
oci_connection *connection;
oci_descriptor *descr;
int dtype;
-
- OCILS_FETCH();
dtype = OCI_DTYPE_LOB;
Index: php4/ext/oci8/php_oci8.h
diff -u php4/ext/oci8/php_oci8.h:1.9 php4/ext/oci8/php_oci8.h:1.10
--- php4/ext/oci8/php_oci8.h:1.9 Sun Jul 2 16:46:43 2000
+++ php4/ext/oci8/php_oci8.h Sat Jul 15 07:54:04 2000
@@ -170,9 +170,7 @@
long num_links;
*/
- int server_num;
HashTable *server;
- int user_num;
HashTable *user;
OCIEnv *pEnv;