clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

--enable-memory-usage-info id deprecated. use --enable-memory-limit instead!

Browse Source
This commit is contained in:
Thies C. Arntzen 2001-05-18 14:32:05 +00:00
parent 8562b074a3
commit 2db3431f00
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -20,9 +20,9 @@ PHP 4.0 NEWS
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)

30
build/rules_common.mk
View File

@ -23,10 +23,10 @@ COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
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 @@ CXX_SUFFIX = .cpp
.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

2
sapi/cgi/cgi_main.c
View File

@ -749,6 +749,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
}
php_request_shutdown((void *) 0);
php_module_shutdown();
STR_FREE(SG(request_info).path_translated);
@ -759,7 +760,6 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
#ifdef ZTS
tsrm_shutdown();
#endif
return exit_status;
}