From: Justin Erenkrantz Date: Mon, 6 May 2002 22:23:52 +0000 (+0000) Subject: Move mod_deflate from experimental to filters to represent our belief X-Git-Tag: 2.0.37~474 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=981f0e17f0dff6f155bdd4af423db2d5e7f93ae9;p=apache Move mod_deflate from experimental to filters to represent our belief in its stability. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94979 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index abf3a4aa33..3bcd6dc1da 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ Changes with Apache 2.0.37 + *) Move mod_deflate out of experimental and into filters. + [Justin Erenkrantz] + *) Get proxy CONNECT basically working. [Jeff Trawick] *) Fix mod_rewrite hang when APR uses SysV Semaphores and diff --git a/STATUS b/STATUS index fda10d8a78..c8d7bc01b9 100644 --- a/STATUS +++ b/STATUS @@ -1,5 +1,5 @@ APACHE 2.0 STATUS: -*-text-*- -Last modified at [$Date: 2002/05/06 22:14:09 $] +Last modified at [$Date: 2002/05/06 22:23:51 $] Release: @@ -54,8 +54,6 @@ RELEASE SHOWSTOPPERS: * for 2.0.37: decide if the MMN bump was warranted - * Move mod_deflate out of experimental - CURRENT VOTES: * Should we always build [support*] binaries statically unless otherwise diff --git a/modules/experimental/NWGNUdeflate b/modules/experimental/NWGNUdeflate deleted file mode 100644 index 42fb48ca03..0000000000 --- a/modules/experimental/NWGNUdeflate +++ /dev/null @@ -1,274 +0,0 @@ -# -# The MOD_DEFLATE module requires the ZLib source which -# can be downloaded from http://www.gzip.org/zlib/ -# -# 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 += \ - $(AP_WORK)/include \ - $(NWOS) \ - $(AP_WORK)/modules/arch/netware \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/apr-util/include \ - $(AP_WORK)/srclib/apr \ - $(AP_WORK)/srclib/zlib \ - $(EOLIST) - -# -# These flags will come after CFLAGS -# -XCFLAGS += \ - -prefix pre_nw.h \ - $(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 += \ - $(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 = deflate - -# -# This is used by the link '-desc ' directive. -# If left blank, NLM_NAME will be used. -# -NLM_DESCRIPTION = Deflate Module - -# -# This is used by the '-threadname' directive. If left blank, -# NLM_NAME Thread will be used. -# -NLM_THREAD_NAME = Deflate Module - -# -# 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 = 8192 - - -# -# 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 these are 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 = - -# -# If there is an NLM target, put it here -# -TARGET_nlm = \ - $(OBJDIR)/deflate.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_deflate.o \ - $(OBJDIR)/adler32.o \ - $(OBJDIR)/crc32.o \ - $(OBJDIR)/deflate.o \ - $(OBJDIR)/trees.o \ - $(OBJDIR)/zutil.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 = \ - aprlib \ - libc \ - $(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 = \ - @$(APR)/aprlib.imp \ - @$(NWOS)/httpd.imp \ - @libc.imp \ - $(EOLIST) - -# -# Any symbols exported to here -# -FILES_nlm_exports = \ - deflate_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 -# - -$(OBJDIR)/%.o: ../../srclib/zlib/%.c $(OBJDIR)\cc.opt - @echo Compiling $< - $(CC) ..\..\srclib\zlib\$(], [return Z_OK;], - [AC_MSG_RESULT(found) - AC_CHECK_HEADERS(zutil.h)], - [AC_MSG_RESULT(not found) - enable_deflate=no - INCLUDES=$ap_save_includes - LDFLAGS=$ap_save_ldflags - LIBS=$ap_save_libs]) - CPPFLAGS=$ap_save_cppflags - fi -]) - APACHE_MODPATH_FINISH diff --git a/modules/filters/config.m4 b/modules/filters/config.m4 index 4fa901d01a..916ce01e8d 100644 --- a/modules/filters/config.m4 +++ b/modules/filters/config.m4 @@ -8,4 +8,57 @@ APACHE_MODULE(include, Server Side Includes, , , yes) APR_ADDTO(LT_LDFLAGS,-export-dynamic) +APACHE_MODULE(deflate, Deflate transfer encoding support, , , no, [ + AC_ARG_WITH(z, APACHE_HELP_STRING(--with-z=DIR,use a specific zlib library), + [ + if test "x$withval" != "xyes" && test "x$withval" != "x"; then + ap_zlib_base="$withval" + fi + ]) + if test "x$ap_zlib_base" = "x"; then + AC_MSG_CHECKING([for zlib location]) + AC_CACHE_VAL(ap_cv_zlib,[ + for dir in /usr/local /usr ; do + if test -d $dir && test -f $dir/include/zlib.h; then + ap_cv_zlib=$dir + break + fi + done + ]) + ap_zlib_base=$ap_cv_zlib + if test "x$ap_zlib_base" = "x"; then + enable_deflate=no + AC_MSG_RESULT([not found]) + else + AC_MSG_RESULT([$ap_zlib_base]) + fi + fi + if test "$enable_deflate" != "no"; then + ap_save_includes=$INCLUDE + ap_save_ldflags=$LDFLAGS + ap_save_libs=$LIBS + ap_save_cppflags=$CPPFLAGS + if test "$ap_zlib_base" != "/usr"; then + APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include]) + dnl put in CPPFLAGS temporarily so that AC_TRY_LINK below will work + CPPFLAGS="$CPPFLAGS -I${ap_zlib_base}/include" + APR_ADDTO(LDFLAGS, [-L${ap_zlib_base}/lib]) + if test "x$ap_platform_runtime_link_flag" != "x"; then + APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib]) + fi + fi + APR_ADDTO(LIBS, [-lz]) + AC_MSG_CHECKING([for zlib library]) + AC_TRY_LINK([#include ], [return Z_OK;], + [AC_MSG_RESULT(found) + AC_CHECK_HEADERS(zutil.h)], + [AC_MSG_RESULT(not found) + enable_deflate=no + INCLUDES=$ap_save_includes + LDFLAGS=$ap_save_ldflags + LIBS=$ap_save_libs]) + CPPFLAGS=$ap_save_cppflags + fi +]) + APACHE_MODPATH_FINISH diff --git a/modules/experimental/mod_deflate.c b/modules/filters/mod_deflate.c similarity index 100% rename from modules/experimental/mod_deflate.c rename to modules/filters/mod_deflate.c diff --git a/modules/experimental/mod_deflate.dsp b/modules/filters/mod_deflate.dsp similarity index 100% rename from modules/experimental/mod_deflate.dsp rename to modules/filters/mod_deflate.dsp diff --git a/modules/experimental/mod_deflate.exp b/modules/filters/mod_deflate.exp similarity index 100% rename from modules/experimental/mod_deflate.exp rename to modules/filters/mod_deflate.exp