CVS update: php3

Date: Sunday December 20, 1998 @ 15:08 Author: shane Update of /repository/php3 In directory asf:/u/temp/cvs-serv19987 Modified Files: main.c makeparser.bat Log Message: reverse last patch to main.c. See source code comments for reason. Index: php3/main.c diff -c php3/main.c:1.482 php3/main.c:1.483 *** php3/main.c:1.482 Fri Dec 18 07:00:16 1998 --- php3/main.c Sun Dec 20 15:08:27 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.482 1998/12/18 12:00:16 zeev Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.483 1998/12/20 20:08:27 shane Exp $ */ /* #define CRASH_DETECTION */ *************** *** 1113,1124 **** start_memory_manager(); - #if !USE_SAPI - if (php3_config_ini_startup(_INLINE_TLS_VOID) == FAILURE) { - return FAILURE; - } - #endif - #if HAVE_SETLOCALE setlocale(LC_CTYPE, ""); #endif --- 1113,1118 ---- *************** *** 1169,1174 **** --- 1163,1177 ---- return FAILURE; } GLOBAL(module_initialized) |= INIT_CONSTANTS; + + /* We cannot do the config starup until after all the above + happens, otherwise loading modules from ini file breaks */ + #if !USE_SAPI + if (php3_config_ini_startup(_INLINE_TLS_VOID) == FAILURE) { + return FAILURE; + } + #endif + if (module_startup_modules() == FAILURE) { php3_printf("Unable to start modules\n"); Index: php3/makeparser.bat diff -c php3/makeparser.bat:1.8 php3/makeparser.bat:1.9 *** php3/makeparser.bat:1.8 Sat May 9 18:39:22 1998 --- php3/makeparser.bat Sun Dec 20 15:08:27 1998 *************** *** 1,4 **** ! bison -p php -v -d language-parser.y flex -Pphp -olanguage-scanner.c -i language-scanner.lex ! bison -p cfg -v -d configuration-parser.y flex -Pcfg -oconfiguration-scanner.c -i configuration-scanner.lex --- 1,4 ---- ! d:\mingw32\bin\bison -p php -v -d language-parser.y flex -Pphp -olanguage-scanner.c -i language-scanner.lex ! d:\mingw32\bin\bison -p cfg -v -d configuration-parser.y flex -Pcfg -oconfiguration-scanner.c -i configuration-scanner.lex -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net