Commit b71fcce1 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

The mem_cache is dead, long live disk_cache. 

Reviewed by: wrowe, sander, fielding, abida, pquerna, jesus, lars

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@711470 13f79535-47bb-0310-9956-ffa450edef68
parent 3f37f7db

Apache.dsw

+0 −27
Original line number Diff line number Diff line
@@ -234,9 +234,6 @@ Package=<4> 
    Project_Dep_Name mod_logio

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_mem_cache

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_mime

    End Project Dependency

    Begin Project Dependency
@@ -2065,30 +2062,6 @@ Package=<4> 


###############################################################################



Project: "mod_mem_cache"=.\modules\cache\mod_mem_cache.dsp - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libaprutil

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libhttpd

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_cache

    End Project Dependency

}}}



###############################################################################



Project: "mod_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4>



Package=<5>

modules/cache/NWGNUmakefile

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ XDCDATA = 
#

TARGET_nlm = \

	$(OBJDIR)/mod_cach.nlm \

	$(OBJDIR)/mem_cach.nlm \

	$(OBJDIR)/dsk_cach.nlm \

	$(OBJDIR)/socachdbm.nlm \

	$(OBJDIR)/socachshmcb.nlm \

modules/cache/NWGNUmem_cach

deleted100644 → 0
+0 −268
Original line number Diff line number Diff line 
#

# Declare the sub-directories to be built here

#



SUBDIRS = \

	$(EOLIST)



#

# Get the 'head' of the build environment.  This includes default targets and

# paths to tools

#



include $(AP_WORK)\build\NWGNUhead.inc



#

# build this level's files

#

# Make sure all needed macro's are defined

#



#

# These directories will be at the beginning of the include list, followed by

# INCDIRS

#

XINCDIRS	+= \

			$(APR)/include \

			$(APRUTIL)/include \

			$(AP_WORK)/include \

			$(AP_WORK)/os/NetWare \

			$(AP_WORK)/server/mpm/NetWare \

			$(AP_WORK)/srclib/pcre \

			$(NWOS) \

			$(EOLIST)



#

# These flags will come after CFLAGS

#

XCFLAGS		+= \

			$(EOLIST)



#

# These defines will come after DEFINES

#

XDEFINES	+= \

			$(EOLIST)



#

# These flags will be added to the link.opt file

#

XLFLAGS		+= \

			$(EOLIST)



#

# These values will be appended to the correct variables based on the value of

# RELEASE

#

ifeq "$(RELEASE)" "debug"

XINCDIRS	+= \

			$(EOLIST)



XCFLAGS		+= \

			$(EOLIST)



XDEFINES	+= \

			-DDEBUG \

			$(EOLIST)



XLFLAGS		+= \

			$(EOLIST)

endif



ifeq "$(RELEASE)" "noopt"

XINCDIRS	+= \

			$(EOLIST)



XCFLAGS		+= \

			$(EOLIST)



XDEFINES	+= \

			$(EOLIST)



XLFLAGS		+= \

			$(EOLIST)

endif



ifeq "$(RELEASE)" "release"

XINCDIRS	+= \

			$(EOLIST)



XCFLAGS		+= \

			$(EOLIST)



XDEFINES	+= \

			$(EOLIST)



XLFLAGS		+= \

			$(EOLIST)

endif



#

# These are used by the link target if an NLM is being generated

# This is used by the link 'name' directive to name the nlm.  If left blank

# TARGET_nlm (see below) will be used.

#

NLM_NAME	= mem_cach



#

# This is used by the link '-desc ' directive.

# If left blank, NLM_NAME will be used.

#

NLM_DESCRIPTION	= Apache $(VERSION_STR) Memory Cache Sub-Module



#

# This is used by the '-threadname' directive.  If left blank,

# NLM_NAME Thread will be used.

#

NLM_THREAD_NAME	= mem_cach



#

# If this is specified, it will override VERSION value in

# $(AP_WORK)\build\NWGNUenvironment.inc

#

NLM_VERSION	=



#

# If this is specified, it will override the default of 64K

#

NLM_STACK_SIZE	= 65536





#

# If this is specified it will be used by the link '-entry' directive

#

NLM_ENTRY_SYM	= _LibCPrelude



#

# If this is specified it will be used by the link '-exit' directive

#

NLM_EXIT_SYM	= _LibCPostlude



#

# If this is specified it will be used by the link '-check' directive

#

NLM_CHECK_SYM	=



#

# If this is specified it will be used by the link '-flags' directive

#

NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION



#

# If this is specified it will be linked in with the XDCData option in the def

# file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled

# by setting APACHE_UNIPROC in the environment

#

XDCDATA		=



#

# Declare all target files (you must add your files here)

#



#

# If there is an NLM target, put it here

#

TARGET_nlm = \

	$(OBJDIR)/mem_cach.nlm \

	$(EOLIST)



#

# If there is an LIB target, put it here

#

TARGET_lib = \

	$(EOLIST)



#

# These are the OBJ files needed to create the NLM target above.

# Paths must all use the '/' character

#

FILES_nlm_objs = \

	$(OBJDIR)/mod_mem_cache.o \

	$(OBJDIR)/cache_hash.o \

	$(OBJDIR)/cache_pqueue.o \

	$(OBJDIR)/cache_cache.o \

	$(EOLIST)



#

# These are the LIB files needed to create the NLM target above.

# These will be added as a library command in the link.opt file.

#

FILES_nlm_libs = \

	libcpre.o \

	$(EOLIST)



#

# These are the modules that the above NLM target depends on to load.

# These will be added as a module command in the link.opt file.

#

FILES_nlm_modules = \

	Apache2 \

	Libc \

	mod_cach \

	$(EOLIST)



#

# If the nlm has a msg file, put it's path here

#

FILE_nlm_msg =



#

# If the nlm has a hlp file put it's path here

#

FILE_nlm_hlp =



#

# If this is specified, it will override $(NWOS)\copyright.txt.

#

FILE_nlm_copyright =



#

# Any additional imports go here

#

FILES_nlm_Ximports = \

	@libc.imp \

	@$(APR)/aprlib.imp \

	@httpd.imp \

	@mod_cache.imp \

	$(EOLIST)



#

# Any symbols exported to here

#

FILES_nlm_exports = \

	mem_cache_module \

	$(EOLIST)



#

# These are the OBJ files needed to create the LIB target above.

# Paths must all use the '/' character

#

FILES_lib_objs = \

	$(EOLIST)



#

# implement targets and dependancies (leave this section alone)

#



libs :: $(OBJDIR) $(TARGET_lib)



nlms :: libs $(TARGET_nlm)



#

# Updated this target to create necessary directories and copy files to the

# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)

#

install :: nlms FORCE



#

# Any specialized rules here

#



#

# Include the 'tail' makefile that has targets that depend on variables defined

# in this makefile

#



include $(AP_WORK)\build\NWGNUtail.inc

modules/cache/mod_mem_cache.c

deleted100644 → 0
+0 −998

File deleted.

Preview size limit exceeded, changes collapsed.

modules/cache/mod_mem_cache.dsp

deleted100644 → 0
+0 −147
Original line number Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="mod_mem_cache" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102



CFG=mod_mem_cache - Win32 Debug

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE 

!MESSAGE NMAKE /f "mod_mem_cache.mak".

!MESSAGE 

!MESSAGE You can specify a configuration when running NMAKE

!MESSAGE by defining the macro CFG on the command line. For example:

!MESSAGE 

!MESSAGE NMAKE /f "mod_mem_cache.mak" CFG="mod_mem_cache - Win32 Debug"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "mod_mem_cache - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

!MESSAGE "mod_mem_cache - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

!MESSAGE 



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

MTL=midl.exe

RSC=rc.exe



!IF  "$(CFG)" == "mod_mem_cache - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "Release"

# PROP BASE Intermediate_Dir "Release"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "Release"

# PROP Intermediate_Dir "Release"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "mod_mem_cache_EXPORTS" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_mem_cache_src" /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /fo"Release/mod_mem_cache.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_mem_cache.so" /d LONG_NAME="mem_cache_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_mem_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_mem_cache.so /opt:ref

# Begin Special Build Tool

TargetPath=.\Release\mod_mem_cache.so

SOURCE="$(InputPath)"

PostBuild_Desc=Embed .manifest

PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

# End Special Build Tool



!ELSEIF  "$(CFG)" == "mod_mem_cache - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "Debug"

# PROP BASE Intermediate_Dir "Debug"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "Debug"

# PROP Intermediate_Dir "Debug"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_mem_cache_src" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /fo"Debug/mod_mem_cache.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_mem_cache.so" /d LONG_NAME="mem_cache_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_mem_cache.so" /base:@..\..\os\win32\BaseAddr.ref,mod_mem_cache.so

# Begin Special Build Tool

TargetPath=.\Debug\mod_mem_cache.so

SOURCE="$(InputPath)"

PostBuild_Desc=Embed .manifest

PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

# End Special Build Tool



!ENDIF 



# Begin Target



# Name "mod_mem_cache - Win32 Release"

# Name "mod_mem_cache - Win32 Debug"

# Begin Group "Header Files"



# PROP Default_Filter "h;hpp;hxx;hm;inl"

# Begin Source File



SOURCE=.\cache_cache.h

# End Source File

# Begin Source File



SOURCE=.\cache_hash.h

# End Source File

# Begin Source File



SOURCE=.\cache_pqueue.h

# End Source File

# Begin Source File



SOURCE=.\mod_cache.h

# End Source File

# End Group

# Begin Group "Source Files"



# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

# Begin Source File



SOURCE=.\cache_cache.c

# End Source File

# Begin Source File



SOURCE=.\cache_hash.c

# End Source File

# Begin Source File



SOURCE=.\cache_pqueue.c

# End Source File

# Begin Source File



SOURCE=.\mod_mem_cache.c

# End Source File

# End Group

# Begin Source File



SOURCE=..\..\build\win32\httpd.rc

# End Source File

# End Target

# End Project