[Jifty-commit] r1808 - jifty/trunk/lib/Jifty

[jifty-commit at lists.jifty.org]

Author: nelhage
Date: Sun Aug 13 20:11:03 2006
New Revision: 1808

Modified:
   jifty/trunk/lib/Jifty/Continuation.pm

Log:
Let's be better about not redirect-looping when calling continuations
to paths that contain multibyte characters. This solution is a hack,
but it's better than looping.

Modified: jifty/trunk/lib/Jifty/Continuation.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Continuation.pm	(original)
+++ jifty/trunk/lib/Jifty/Continuation.pm	Sun Aug 13 20:11:03 2006
@@ -129,10 +129,13 @@
     my $request_path = $self->request->path;
 
     # XXX TODO: WE should be using URI canonicalization
+
     my $escape;
     $called_uri =~ s{/+}{/}g;
+    $called_uri = Encode::encode_utf8($called_uri);
     $called_uri = $escape while $called_uri ne ($escape = URI::Escape::uri_unescape($called_uri));
     $request_path =~ s{/+}{/}g; 
+    $request_path = Encode::encode_utf8($request_path);
     $request_path = $escape while $request_path ne ($escape = URI::Escape::uri_unescape($request_path));
 
     return $called_uri =~ /^\Q$request_path\E[?&;]J:RETURN=@{[$self->id]}$/;