[Rt-commit] [svn] r1448 - in rt: . branches/3.3-TESTING branches/3.3-TESTING/bin

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Wed Sep  8 05:02:12 2004
New Revision: 1448

Modified:
   rt/   (props changed)
   rt/branches/3.3-TESTING/README
   rt/branches/3.3-TESTING/bin/webmux.pl.in
Log:
 r4031 at not:  autrijus | 2004-09-07T20:56:58.734255Z
 
 
 
 r4032 at not:  autrijus | 2004-09-07T21:02:14.437187Z
 * Unify httpd.conf settings for mod_perl1 and mod_perl2.


Modified: rt/branches/3.3-TESTING/README
==============================================================================
--- rt/branches/3.3-TESTING/README	(original)
+++ rt/branches/3.3-TESTING/README	Wed Sep  8 05:02:12 2004
@@ -218,9 +218,6 @@
     DocumentRoot /opt/rt3/share/html
     AddDefaultCharset UTF-8
 
-    # This line applies to Apache2+mod_perl2 only:
-    RedirectMatch permanent (.*)/$ $1/index.html
-
     PerlModule Apache::DBI
     PerlRequire /opt/rt3/bin/webmux.pl
 

Modified: rt/branches/3.3-TESTING/bin/webmux.pl.in
==============================================================================
--- rt/branches/3.3-TESTING/bin/webmux.pl.in	(original)
+++ rt/branches/3.3-TESTING/bin/webmux.pl.in	Wed Sep  8 05:02:12 2004
@@ -104,7 +104,16 @@
     RT::Init();
 
     # We don't need to handle non-text, non-xml items
-    return -1 if defined( $r->content_type ) && $r->content_type !~ m!(^text/|\bxml\b)!io;
+    defined( $r->content_type ) or return -1;
+
+    if ($r->content_type =~ m/^httpd\b.*\bdirectory/i) {
+        # Our DirectoryIndex is always index.html, regardless of httpd settings
+        $r->filename( $r->filename . 'index.html' );
+    }
+    elsif ($r->content_type !~ m!(^text/|\bxml\b)!i) {
+        return -1;
+    }
+
 
     my %session;
     my $status;