httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r290669 - in /httpd/httpd/trunk: ./ modules/experimental/ modules/filters/
Date Wed, 21 Sep 2005 09:46:25 GMT
Author: niq
Date: Wed Sep 21 02:46:12 2005
New Revision: 290669

URL: http://svn.apache.org/viewcvs?rev=290669&view=rev
Log:
Move mod_filter and mod_charset_lite from /experimental/ to /filters/

Added:
    httpd/httpd/trunk/modules/filters/NWGNUcharsetl
      - copied unchanged from r290663, httpd/httpd/trunk/modules/experimental/NWGNUcharsetl
    httpd/httpd/trunk/modules/filters/NWGNUmod_filter
      - copied unchanged from r290663, httpd/httpd/trunk/modules/experimental/NWGNUmod_filter
    httpd/httpd/trunk/modules/filters/mod_charset_lite.c
      - copied unchanged from r290663, httpd/httpd/trunk/modules/experimental/mod_charset_lite.c
    httpd/httpd/trunk/modules/filters/mod_charset_lite.dsp
      - copied unchanged from r290663, httpd/httpd/trunk/modules/experimental/mod_charset_lite.dsp
    httpd/httpd/trunk/modules/filters/mod_charset_lite.exp
      - copied unchanged from r290663, httpd/httpd/trunk/modules/experimental/mod_charset_lite.exp
    httpd/httpd/trunk/modules/filters/mod_filter.c
      - copied unchanged from r290663, httpd/httpd/trunk/modules/experimental/mod_filter.c
Removed:
    httpd/httpd/trunk/modules/experimental/NWGNUcharsetl
    httpd/httpd/trunk/modules/experimental/NWGNUmod_filter
    httpd/httpd/trunk/modules/experimental/mod_charset_lite.c
    httpd/httpd/trunk/modules/experimental/mod_charset_lite.dsp
    httpd/httpd/trunk/modules/experimental/mod_charset_lite.exp
    httpd/httpd/trunk/modules/experimental/mod_filter.c
Modified:
    httpd/httpd/trunk/Apache.dsw
    httpd/httpd/trunk/Makefile.win
    httpd/httpd/trunk/modules/experimental/NWGNUmakefile
    httpd/httpd/trunk/modules/experimental/config.m4
    httpd/httpd/trunk/modules/filters/NWGNUmakefile
    httpd/httpd/trunk/modules/filters/config.m4

Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Apache.dsw?rev=290669&r1=290668&r2=290669&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Wed Sep 21 02:46:12 2005
@@ -1044,7 +1044,7 @@
 
 ###############################################################################
 
-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>
 {{{

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.win?rev=290669&r1=290668&r2=290669&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Wed Sep 21 02:46:12 2005
@@ -246,12 +246,12 @@
 	 $(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 @@
 	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)")

Modified: httpd/httpd/trunk/modules/experimental/NWGNUmakefile
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/NWGNUmakefile?rev=290669&r1=290668&r2=290669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/experimental/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/experimental/NWGNUmakefile Wed Sep 21 02:46:12 2005
@@ -152,9 +152,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/charsetl.nlm \
 	$(OBJDIR)/example.nlm \
-	$(OBJDIR)/mod_filter.nlm \
 	$(EOLIST)
 	
 #

Modified: httpd/httpd/trunk/modules/experimental/config.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/config.m4?rev=290669&r1=290668&r2=290669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/experimental/config.m4 (original)
+++ httpd/httpd/trunk/modules/experimental/config.m4 Wed Sep 21 02:46:12 2005
@@ -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

Modified: httpd/httpd/trunk/modules/filters/NWGNUmakefile
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/filters/NWGNUmakefile?rev=290669&r1=290668&r2=290669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/filters/NWGNUmakefile Wed Sep 21 02:46:12 2005
@@ -153,6 +153,8 @@
 #
 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

Modified: httpd/httpd/trunk/modules/filters/config.m4
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/filters/config.m4?rev=290669&r1=290668&r2=290669&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/config.m4 (original)
+++ httpd/httpd/trunk/modules/filters/config.m4 Wed Sep 21 02:46:12 2005
@@ -6,6 +6,16 @@
 
 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),



Mime
View raw message