[Jifty-commit] r596 -
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sat Feb 18 15:04:32 EST 2006
Author: jesse
Date: Sat Feb 18 15:04:31 2006
New Revision: 596
Modified:
/ (props changed)
jifty/trunk/lib/Jifty/Dispatcher.pm
Log:
r23856 at truegrounds: jesse | 2006-02-18 12:03:07 -0800
* Checkpoint dispatcher triage for a baton-pass to alex
Modified: jifty/trunk/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Dispatcher.pm (original)
+++ jifty/trunk/lib/Jifty/Dispatcher.pm Sat Feb 18 15:04:31 2006
@@ -412,9 +412,7 @@
local $Dispatcher = $self->new();
-HANDLER: {
- $Dispatcher->_do_dispatch($path);
- }
+ $Dispatcher->_do_dispatch($path);
}
=head2 _handle_rules RULESET
@@ -704,20 +702,18 @@
$self->log->debug("Dispatching request to ".$self->{path});
eval {
- HANDLER: {
$self->_handle_rules( [ $self->rules('SETUP') ] );
- HANDLE_WEB: {
- Jifty->web->handle_request();
- }
+ HANDLE_WEB: { Jifty->web->handle_request(); }
$self->_handle_rules( [ $self->rules('RUN'), 'show' ] );
$self->_handle_rules( [ $self->rules('CLEANUP') ] );
- }
};
if ( my $err = $@ ) {
warn ref($err) . " " ."'$err'" if ( $err !~ /^LAST RULE/);
}
+ last_rule;
}
+
=head2 _match CONDITION
Returns the regular expression matched if the current request fits
More information about the Jifty-commit
mailing list