[PHP4BETA] CVS update: php4

Date: Tuesday April 27, 1999 @ 6:00 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv30127 Modified Files: configuration-parser.y configuration-scanner.l main.c php4dll.dsp php4dllts.dsp php_globals.h Log Message: * Get rid of the memory leak messages in case of fatal errors or exit() * .dsp fixes * Minor fixes Index: php4/configuration-parser.y diff -u php4/configuration-parser.y:1.11 php4/configuration-parser.y:1.12 --- php4/configuration-parser.y:1.11 Mon Apr 26 15:02:59 1999 +++ php4/configuration-parser.y Tue Apr 27 06:00:54 1999 @@ -30,7 +30,7 @@ -/* $Id: configuration-parser.y,v 1.11 1999/04/26 19:02:59 zeev Exp $ */ +/* $Id: configuration-parser.y,v 1.12 1999/04/27 10:00:54 zeev Exp $ */ #define DEBUG_CFG_PARSER 1 #include "php.h" @@ -348,6 +348,8 @@ %token EXTENSION %token T_ZEND_EXTENSION %token T_ZEND_EXTENSION_TS +%token T_ZEND_EXTENSION_DEBUG +%token T_ZEND_EXTENSION_DEBUG_TS %% @@ -380,13 +382,25 @@ php3_dl(&$3,MODULE_PERSISTENT,&dummy); } | T_ZEND_EXTENSION '=' string { -#ifndef ZTS +#if !defined(ZTS) && !defined(ZEND_DEBUG) zend_load_extension($3.value.str.val); #endif free($3.value.str.val); } | T_ZEND_EXTENSION_TS '=' string { -#ifdef ZTS +#if defined(ZTS) && !defined(ZEND_DEBUG) + zend_load_extension($3.value.str.val); +#endif + free($3.value.str.val); + } + | T_ZEND_EXTENSION_DEBUG '=' string { +#if !defined(ZTS) && defined(ZEND_DEBUG) + zend_load_extension($3.value.str.val); +#endif + free($3.value.str.val); + } + | T_ZEND_EXTENSION_DEBUG_TS '=' string { +#if defined(ZTS) && defined(ZEND_DEBUG) zend_load_extension($3.value.str.val); #endif free($3.value.str.val); Index: php4/configuration-scanner.l diff -u php4/configuration-scanner.l:1.2 php4/configuration-scanner.l:1.3 --- php4/configuration-scanner.l:1.2 Mon Apr 26 15:02:59 1999 +++ php4/configuration-scanner.l Tue Apr 27 06:00:54 1999 @@ -64,6 +64,17 @@ return T_ZEND_EXTENSION_TS; } + +<INITIAL>"zend_extension_debug" { + return T_ZEND_EXTENSION_DEBUG; +} + + +<INITIAL>"zend_extension_debug_ts" { + return T_ZEND_EXTENSION_DEBUG_TS; +} + + <INITIAL>[ ]*("true"|"on"|"yes")[ ]* { cfglval->value.str.val = php3_strndup("1",1); cfglval->value.str.len = 1; Index: php4/main.c diff -u php4/main.c:1.36 php4/main.c:1.37 --- php4/main.c:1.36 Mon Apr 26 16:20:11 1999 +++ php4/main.c Tue Apr 27 06:00:54 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.36 1999/04/26 20:20:11 zeev Exp $ */ +/* $Id: main.c,v 1.37 1999/04/27 10:00:54 zeev Exp $ */ #include <stdio.h> @@ -597,8 +597,10 @@ -int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) +int php_request_startup(CLS_D ELS_DC PLS_DC) { + PG(unclean_shutdown) = 0; + zend_output_startup(); php3_set_timeout(PG(max_execution_time)); @@ -629,7 +631,6 @@ init_compiler(CLS_C ELS_CC); init_executor(CLS_C ELS_CC); - startup_scanner(CLS_C); @@ -659,6 +660,7 @@ #endif CLS_FETCH(); ELS_FETCH(); + PLS_FETCH(); php3_header(); zend_end_ob_buffering(1); @@ -673,7 +675,7 @@ shutdown_executor(ELS_C); php3_destroy_request_info(NULL); - shutdown_memory_manager(0, 0); + shutdown_memory_manager(PG(unclean_shutdown), 0); php3_unset_timeout(); @@ -1130,6 +1132,7 @@ } if (setjmp(EG(bailout))!=0) { + PG(unclean_shutdown) = 1; return; } _php3_hash_environment(PLS_C); @@ -1156,6 +1159,8 @@ if (EG(main_op_array)) { EG(active_op_array) = EG(main_op_array); zend_execute(EG(main_op_array) ELS_CC); + } else { + PG(unclean_shutdown) = 1; } } Index: php4/php4dll.dsp diff -u php4/php4dll.dsp:1.3 php4/php4dll.dsp:1.4 --- php4/php4dll.dsp:1.3 Mon Apr 26 15:02:59 1999 +++ php4/php4dll.dsp Tue Apr 27 06:00:54 1999 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "..\libzend" /I "." /I "regex\\" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\libzend" /I "." /I "regex" /I "..\bindlib_w32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "..\libzend" /I "." /I "regex\\" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\libzend" /I "." /I "regex" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.3 php4/php4dllts.dsp:1.4 --- php4/php4dllts.dsp:1.3 Mon Apr 26 15:02:59 1999 +++ php4/php4dllts.dsp Tue Apr 27 06:00:54 1999 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "..\libzend" /I "." /I "regex\\" /I "..\tsrm" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "WIN32" /D "_MBCS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\libzend" /I "." /I "regex\\" /I "..\tsrm" /I "..\bindlib_w32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "WIN32" /D "_MBCS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "..\libzend" /I "." /I "regex\\" /I "..\tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\libzend" /I "." /I "regex\\" /I "..\tsrm" /I "..\bindlib_w32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "ZTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "WIN32" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" Index: php4/php_globals.h diff -u php4/php_globals.h:1.10 php4/php_globals.h:1.11 --- php4/php_globals.h:1.10 Mon Apr 26 10:00:46 1999 +++ php4/php_globals.h Tue Apr 27 06:00:54 1999 @@ -65,6 +65,7 @@ long y2k_compliance; unsigned char header_is_being_sent; + unsigned char unclean_shutdown; }; -- PHP 4 Beta