[Jifty-commit] r606 -

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sun Feb 19 23:08:55 2006
New Revision: 606

Modified:
   /   (props changed)
   jifty/trunk/lib/Jifty/Dispatcher.pm

Log:
 r24439 at truegrounds:  root | 2006-02-19 20:42:11 -0500
 * Dispatcher fixes to deal with 
 
     /path/to/dir
 and /path/to/dir/ 
 
 more reasonably as equals without exploding
 


Modified: jifty/trunk/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Dispatcher.pm	(original)
+++ jifty/trunk/lib/Jifty/Dispatcher.pm	Sun Feb 19 23:08:55 2006
@@ -640,7 +640,6 @@
     if ( $path =~ m{/$} and
         Jifty->handler->mason->interp->comp_exists( $path . "/index.html" ) )
     {
-        warn "Canonicalized $path with /index.html";
         $path .= "/index.html";
     }
 
@@ -656,7 +655,7 @@
         )
     {
 
-        $self->_do_dispatch( $path . "/" );
+        $self->_do_show( $path . "/" );
     }
 
     # Set the request path
@@ -725,6 +724,7 @@
     };
     if ( my $err = $@ ) {
         $self->log->warn(ref($err) . " " ."'$err'") if ( $err !~ /^LAST RULE/);
+
     }
     last_rule;
 }
@@ -844,7 +844,7 @@
     if ( $Dispatcher->{rule} eq 'on' ) {
 
         # "on" anchors on complete match only
-        $cond .= '\\z';
+        $cond .= '/?\\z';
     } else {
 
         # "in" anchors on prefix match in directory boundary