[PHP-DEV] CVS update: php31/main From: shane (php-dev <email protected>)
Date: 06/26/98

Date: Friday June 26, 1998 @ 15:11
Author: shane

Update of /repository/php31/main
In directory asf:/tmp/cvs-serv9920/main

Modified Files:
        main.c php3_ini.c
Log Message:
more apache work. crashing at request shutdown because it gets called twice. how?

Index: php31/main/main.c
diff -c php31/main/main.c:1.31 php31/main/main.c:1.32
*** php31/main/main.c:1.31 Fri Jun 26 13:33:22 1998
--- php31/main/main.c Fri Jun 26 15:11:05 1998
***************
*** 29,35 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: main.c,v 1.31 1998/06/26 17:33:22 shane Exp $ */
  
  /* #define CRASH_DETECTION */
  
--- 29,35 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: main.c,v 1.32 1998/06/26 19:11:05 shane Exp $ */
  
  /* #define CRASH_DETECTION */
  
***************
*** 651,656 ****
--- 651,658 ----
  #if defined(CRASH_DETECTION)
          debug_log("php3_request_shutdown()");
  #endif
+ /* FIXME: why is apache calling this function, and where the hell from? */
+ if(!php3_globals || !GLOBAL(initialized))return;
          if (GLOBAL(initialized) & INIT_SYMBOL_TABLE) {
                  _php3_hashdestroy(&GLOBAL(symbol_table));
                  GLOBAL(initialized) &= ~INIT_SYMBOL_TABLE;
Index: php31/main/php3_ini.c
diff -c php31/main/php3_ini.c:1.1 php31/main/php3_ini.c:1.2
*** php31/main/php3_ini.c:1.1 Thu Jun 25 21:00:25 1998
--- php31/main/php3_ini.c Fri Jun 26 15:11:06 1998
***************
*** 23,29 ****
  
  PHPAPI void _php3_set_ini(php3_ini_structure *conf){
          TLS_VARS;
! memcpy(&GLOBAL(php3_ini),conf,sizeof(php3_ini_structure));
  }
  
  /*
--- 23,30 ----
  
  PHPAPI void _php3_set_ini(php3_ini_structure *conf){
          TLS_VARS;
! GLOBAL(php3_ini)=_php3_copy_ini_master();
! if(conf)memcpy(GLOBAL(php3_ini),conf,sizeof(php3_ini_structure));
  }
  
  /*