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

[autrijus at pallas.eruditorum.org]

Author: autrijus
Date: Wed Sep 22 13:16:22 2004
New Revision: 1546

Modified:
   rt/   (props changed)
   rt/branches/3.3-TESTING/bin/webmux.pl.in
Log:
 r7965 at not:  autrijus | 2004-09-21T13:18:07.917938Z
 
 
 
 r8021 at not:  autrijus | 2004-09-22T17:15:50.576469Z
 * On mod_perl1 with root directory, ->filename is empty, not '/',
   hence breaking index.html handling.  Entirely my fault.


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 22 13:16:22 2004
@@ -105,8 +105,9 @@
 
     # We don't need to handle non-text, non-xml items
     if ($r->content_type =~ m/^httpd\b.*\bdirectory/i) {
+        use File::Spec::Unix;
         # Our DirectoryIndex is always index.html, regardless of httpd settings
-        $r->filename( $r->filename . 'index.html' );
+        $r->filename( File::Spec::Unix->catfile( $r->filename, 'index.html' ) );
     }
     elsif (defined( $r->content_type )) {
 	$r->content_type =~ m!(^text/|\bxml\b)!i or return -1;