validator/httpd/conf httpd.conf,1.19,1.20 mime.types,1.1,1.2

Update of /sources/public/validator/httpd/conf
In directory hutz:/tmp/cvs-serv15496/httpd/conf

Modified Files:
	httpd.conf mime.types 
Log Message:
Merging from branch validator-0_6_0-branch, at tag validator-0_6_5-release.


Index: mime.types
===================================================================
RCS file: /sources/public/validator/httpd/conf/mime.types,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mime.types	24 Jul 1998 22:23:57 -0000	1.1
+++ mime.types	9 May 2004 15:56:54 -0000	1.2
@@ -73,6 +73,7 @@
 audio/x-wav			wav
 chemical/x-pdb			pdb xyz
 image/gif			gif
+image/svg+xml                 svg
 image/ief			ief
 image/jpeg			jpeg jpg jpe
 image/png			png

Index: httpd.conf
===================================================================
RCS file: /sources/public/validator/httpd/conf/httpd.conf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- httpd.conf	5 Apr 2004 20:33:07 -0000	1.19
+++ httpd.conf	9 May 2004 15:56:54 -0000	1.20
@@ -1,4 +1,4 @@
-#
+#                                                                -*- apache -*-
 # Example httpd.conf snippet for W3C Markup Validation Service
 # Note that this is not a complete server configuration file, but contains
 # only the validator-specific part.
@@ -9,38 +9,46 @@
 #
 
 # The values below assume that you have the validator files in
-# /var/www/html/w3c-validator, and that /var/www/html is your DocumentRoot.
-# If not, tune these accordingly.
+# /usr/share/w3c-markup-validator.  If not, tune them according to your setup.
+
+# Note that it is not recommended to run the validator under mod_perl
+# at the moment.
 
 # This is the directory where you have the validator's "check"
 # script as well as its and *.html, *.css etc files.
+Alias /w3c-validator/ "/usr/share/w3c-markup-validator/"
 
-<Directory /var/www/html/w3c-validator>
-  Options              ExecCGI IncludesNOEXEC Indexes MultiViews
-  AllowOverride        None
-  AddHandler           server-parsed .html
-  AddCharset           utf-8         .html
+<Directory /usr/share/w3c-markup-validator>
+  Options               ExecCGI IncludesNOEXEC Indexes MultiViews
+  AllowOverride         None
+  AddHandler            server-parsed .html
+  AddCharset            utf-8         .html
 </Directory>
 
-# To use mod_perl (only 1.2x with Apache 1.3.x for now!), uncomment this
-# and the other mod_perl block inside the LocationMatch below.
+<IfModule mod_perl.c>
 
-#<IfModule mod_perl.c>
-#  PerlModule           Apache::Registry
-#  PerlTaintCheck       On
-#  PerlWarn             On
-#</IfModule>
+  # mod_perl 1.2x:
+  #PerlModule            Apache::Registry
+  #PerlTaintCheck        On
+  #PerlWarn              On
 
-# Tell httpd that "check" is a CGI script.
+  # mod_perl 1.99+:
+  #PerlModule            ModPerl::Registry
+  #PerlSwitches          -wT
 
-<Location "/w3c-validator/check">
+</IfModule>
 
-  SetHandler           cgi-script
+# Tell httpd that "check" is a CGI script.
+<Location "/w3c-validator/check">
+  SetHandler            cgi-script
 
-#<IfModule mod_perl.c>
-#  PerlSendHeader       On
-#  SetHandler           perl-script
-#  PerlHandler          Apache::Registry
-#</IfModule>
+  <IfModule mod_perl.c>
+    # mod_perl 1.2x:
+    #PerlHandler         Apache::Registry
+    #PerlSendHeader      On
 
+    # mod_perl 1.99+:
+    #PerlResponseHandler ModPerl::Registry
+    #PerlOptions         +ParseHeaders
+  </IfModule>
 </Location>

Received on Sunday, 9 May 2004 11:57:48 UTC