cvs: php4 / NEWS /build rules_common.mk /sapi/cgi cgi_main.c

thies Fri May 18 07:32:08 2001 EDT Modified files: /php4 NEWS /php4/build rules_common.mk /php4/sapi/cgi cgi_main.c Log: --enable-memory-usage-info id deprecated. use --enable-memory-limit instead! Index: php4/NEWS diff -u php4/NEWS:1.673 php4/NEWS:1.674 --- php4/NEWS:1.673 Thu May 17 18:09:26 2001 +++ php4/NEWS Fri May 18 07:32:05 2001 @@ -20,9 +20,9 @@ members $obj->Release() and $obj->AddRef() to gain more control over the used COM components. (phanto) - Added an additional parameter to dotnet_load to specify the codepage (phanto) -- Added --enable-memory-usage-info. This creates a new Apache 1.x logging - directive "{mod_php_memory_usage}n" which will log the peak amount of memory - used by the script. (Thies) +- Added peak memory logging. Use --enable-memory-limit to create a new Apache + 1.x logging directive "{mod_php_memory_usage}n" which will log the peak + amount of memory used by the script. (Thies) - Made fstat() and stat() provide identical output by returning a numerical and string indexed array. (Jason) - Fixed memory leak upon re-registering constants. (Sascha, Zend Engine) Index: php4/build/rules_common.mk diff -u php4/build/rules_common.mk:1.6 php4/build/rules_common.mk:1.7 --- php4/build/rules_common.mk:1.6 Sat May 12 05:22:33 2001 +++ php4/build/rules_common.mk Fri May 18 07:32:05 2001 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: rules_common.mk,v 1.6 2001/05/12 12:22:33 sas Exp $ +# $Id: rules_common.mk,v 1.7 2001/05/18 14:32:05 thies Exp $ # include $(top_builddir)/config_vars.mk @@ -23,10 +23,10 @@ COMPILE = $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) CXX_COMPILE = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@ -CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@ +SHARED_COMPILE = $(SHARED_LIBTOOL) --silent --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@ +CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --silent --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@ -LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --silent --mode=link $(COMPILE) $(LDFLAGS) -o $@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c @@ -42,28 +42,36 @@ .SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l .c.o: - $(COMPILE) -c $< + @echo Compiling $< + @$(COMPILE) -c $< $(CXX_SUFFIX).o: - $(CXX_COMPILE) -c $< + @echo Compiling $< + @$(CXX_COMPILE) -c $< .s.o: - $(COMPILE) -c $< + @echo Compiling $< + @$(COMPILE) -c $< .c.lo: - $(PHP_COMPILE) + @echo Compiling $< + @$(PHP_COMPILE) $(CXX_SUFFIX).lo: - $(CXX_PHP_COMPILE) + @echo Compiling $< + @$(CXX_PHP_COMPILE) .s.lo: - $(PHP_COMPILE) + @echo Compiling $< + @$(PHP_COMPILE) .c.slo: - $(SHARED_COMPILE) + @echo Compiling $< + @$(SHARED_COMPILE) $(CXX_SUFFIX).slo: - $(CXX_SHARED_COMPILE) + @echo Compiling $< + @$(CXX_SHARED_COMPILE) .y.c: $(YACC) $(YFLAGS) $< && mv y.tab.c $*.c Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.107 php4/sapi/cgi/cgi_main.c:1.108 --- php4/sapi/cgi/cgi_main.c:1.107 Thu May 10 07:13:18 2001 +++ php4/sapi/cgi/cgi_main.c Fri May 18 07:32:05 2001 @@ -749,6 +749,7 @@ } php_request_shutdown((void *) 0); + php_module_shutdown(); STR_FREE(SG(request_info).path_translated); @@ -759,7 +760,6 @@ #ifdef ZTS tsrm_shutdown(); #endif - return exit_status; }