[PHP-DEV] CVS update: php31/ext/standard From: shane (php-dev <email protected>)
Date: 05/30/98

Date: Saturday May 30, 1998 @ 17:46
Author: shane

Update of /repository/php31/ext/standard
In directory asf:/tmp/cvs-serv11753/ext/standard

Modified Files:
        basic_functions.c
Log Message:
Major improvement. Hasing the environment was killing isapi in module shutdown. If I dont hash it, no access violation in module shutdown :) (now why?)

Index: php31/ext/standard/basic_functions.c
diff -c php31/ext/standard/basic_functions.c:1.5 php31/ext/standard/basic_functions.c:1.6
*** php31/ext/standard/basic_functions.c:1.5 Sat May 30 09:06:58 1998
--- php31/ext/standard/basic_functions.c Sat May 30 17:46:54 1998
***************
*** 285,291 ****
  {
          TLS_VARS;
          GLOBAL(strtok_string) = NULL;
! #if HAVE_PUTENV
          if (hash_init(&putenv_ht, 1, NULL, (void (*)(void *)) _php3_putenv_destructor, 0) == FAILURE) {
                  return FAILURE;
          }
--- 285,295 ----
  {
          TLS_VARS;
          GLOBAL(strtok_string) = NULL;
! /* FIXME hashing the environment causes a meltdown on rshutdown
! Dont think allowing putenv in multthreaded single process is a good
! idea unless each thread gets its own environment ???
! */
! #if HAVE_PUTENV && !defined(THREAD_SAFE)
          if (hash_init(&putenv_ht, 1, NULL, (void (*)(void *)) _php3_putenv_destructor, 0) == FAILURE) {
                  return FAILURE;
          }
***************
*** 297,303 ****
  {
          TLS_VARS;
          STR_FREE(GLOBAL(strtok_string));
! #if HAVE_PUTENV
          hash_destroy(&putenv_ht);
  #endif
          return SUCCESS;
--- 301,307 ----
  {
          TLS_VARS;
          STR_FREE(GLOBAL(strtok_string));
! #if HAVE_PUTENV && !defined(THREAD_SAFE)
          hash_destroy(&putenv_ht);
  #endif
          return SUCCESS;