Move mod_filter and mod_charset_lite from /experimental/ to /filters/

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

diff --git a/Apache.dsw b/Apache.dsw
index c4ecec642366450d5b82777a1fc9036f4089c97e..c99e624567c9105adc706b01436397427ec1f5dc 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -1044,7 +1044,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_charset_lite"=.\modules\experimental\mod_charset_lite.dsp - Package Owner=<4>
+Project: "mod_charset_lite"=.\modules\filters\mod_charset_lite.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Makefile.win b/Makefile.win
index c6b090cee9863ef02f190083eaa3666ac146acda..4bc4279a85d4ff2ba71881c66959712ce0641483 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -246,12 +246,12 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_dumpio.mak      CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd modules\experimental
-        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd modules\filters
 !IF EXIST("srclib\zlib")
         $(MAKE) $(MAKEOPT) -f mod_deflate.mak     CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
+        $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_include.mak     CFG="mod_include - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
@@ -399,7 +399,7 @@ _copybin:
        copy modules\dav\main\$(LONG)\mod_dav.$(src_so)         "$(inst_so)" <.y
        copy modules\debug\$(LONG)\mod_bucketeer.$(src_so)      "$(inst_so)" <.y
        copy modules\debug\$(LONG)\mod_dumpio.$(src_so)         "$(inst_so)" <.y
-       copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so)    "$(inst_so)" <.y
+       copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
 !IF EXIST("srclib\zlib")
        copy modules\filters\$(LONG)\mod_deflate.$(src_so)      "$(inst_so)" <.y
 !IF EXIST("srclib\zlib\zlib1.$(src_dll)")

diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile
index d6e1337a29f611154d318710be7321d4b648c5bb..78e453e99011b69132557cffb0e92023b9931da0 100644 (file)
--- a/modules/experimental/NWGNUmakefile
+++ b/modules/experimental/NWGNUmakefile
@@ -152,9 +152,7 @@ XDCDATA         =
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-       $(OBJDIR)/charsetl.nlm \
        $(OBJDIR)/example.nlm \
-       $(OBJDIR)/mod_filter.nlm \
        $(EOLIST)
        
 #

diff --git a/modules/experimental/config.m4 b/modules/experimental/config.m4
index c1a91e646b00ba6e1cf79da00170b51dc6d4a120..07cab54e05c91cc7511087d7f6078a9941172f8d 100644 (file)
--- a/modules/experimental/config.m4
+++ b/modules/experimental/config.m4
@@ -1,18 +1,18 @@
 
 APACHE_MODPATH_INIT(experimental)
 
-if test "$ac_cv_ebcdic" = "yes"; then
+#if test "$ac_cv_ebcdic" = "yes"; then
 # mod_charset_lite can be very useful on an ebcdic system, 
 #   so include it by default
-    APACHE_MODULE(charset_lite, character set translation, , , yes)
-else
-    APACHE_MODULE(charset_lite, character set translation, , , no)
-fi
+#    APACHE_MODULE(charset_lite, character set translation, , , yes)
+#else
+#    APACHE_MODULE(charset_lite, character set translation, , , no)
+#fi
 
 APACHE_MODULE(example, example and demo module, , , no)
 APACHE_MODULE(case_filter, example uppercase conversion filter, , , no)
 APACHE_MODULE(case_filter_in, example uppercase conversion input filter, , , no)
-APACHE_MODULE(filter, smart filtering module, , , no)
+#APACHE_MODULE(filter, smart filtering module, , , no)
 APACHE_MODULE(dbd, Apache DBD Framework, , , no)
 
 APACHE_MODPATH_FINISH

diff --git a/modules/experimental/NWGNUcharsetl b/modules/filters/NWGNUcharsetl
similarity index 100%
rename from modules/experimental/NWGNUcharsetl
rename to modules/filters/NWGNUcharsetl

diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile
index c8509428eb642d93fc87b98a996a5def34ae111e..33e48a2595717c1185a77e99db7d652c6cecffe4 100644 (file)
--- a/modules/filters/NWGNUmakefile
+++ b/modules/filters/NWGNUmakefile
@@ -153,6 +153,8 @@ XDCDATA         =
 #
 TARGET_nlm = \
        $(OBJDIR)/extfiltr.nlm \
+       $(OBJDIR)/charsetl.nlm \
+       $(OBJDIR)/mod_filter.nlm \
        $(EOLIST)
        
 # If the zlib libraries source exists then build the mod_deflate module

diff --git a/modules/experimental/NWGNUmod_filter b/modules/filters/NWGNUmod_filter
similarity index 100%
rename from modules/experimental/NWGNUmod_filter
rename to modules/filters/NWGNUmod_filter

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index a481e4037004a8ad0ffe7a7e5536e119cdeffdef..c9c8f386c9eb4a3b020fbbfb23feab485a6a9019 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -6,6 +6,16 @@ APACHE_MODPATH_INIT(filters)
 
 APACHE_MODULE(ext_filter, external filter module, , , most)
 APACHE_MODULE(include, Server Side Includes, , , yes)
+APACHE_MODULE(filter, Smart Filtering, , , yes)
+
+if test "$ac_cv_ebcdic" = "yes"; then
+# mod_charset_lite can be very useful on an ebcdic system,
+#   so include it by default
+    APACHE_MODULE(charset_lite, character set translation, , , yes)
+else
+    APACHE_MODULE(charset_lite, character set translation, , , no)
+fi
+
 
 APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
   AC_ARG_WITH(z, APACHE_HELP_STRING(--with-z=DIR,use a specific zlib library),

diff --git a/modules/experimental/mod_charset_lite.c b/modules/filters/mod_charset_lite.c
similarity index 100%
rename from modules/experimental/mod_charset_lite.c
rename to modules/filters/mod_charset_lite.c

diff --git a/modules/experimental/mod_charset_lite.dsp b/modules/filters/mod_charset_lite.dsp
similarity index 100%
rename from modules/experimental/mod_charset_lite.dsp
rename to modules/filters/mod_charset_lite.dsp

diff --git a/modules/experimental/mod_charset_lite.exp b/modules/filters/mod_charset_lite.exp
similarity index 100%
rename from modules/experimental/mod_charset_lite.exp
rename to modules/filters/mod_charset_lite.exp

diff --git a/modules/experimental/mod_filter.c b/modules/filters/mod_filter.c
similarity index 100%
rename from modules/experimental/mod_filter.c
rename to modules/filters/mod_filter.c