[Jifty-commit] jifty branch, master, updated. c144471c4bbca7afbd6a3dfaeec7b728e61a091f

[Jifty commits]

The branch, master has been updated
       via  c144471c4bbca7afbd6a3dfaeec7b728e61a091f (commit)
       via  0093fc20c2d07a9c42937a6ae5c4a20e512edbf3 (commit)
      from  41398e146e28395a8c33f1605d6a5dce28c5c158 (commit)

Summary of changes:
 Makefile.PL          |    2 +-
 lib/Jifty/Request.pm |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 0093fc20c2d07a9c42937a6ae5c4a20e512edbf3
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Jul 16 08:31:30 2010 +0800

    unescape path part of uri from plack, because it is escaped in plack

diff --git a/lib/Jifty/Request.pm b/lib/Jifty/Request.pm
index be2eb9d..ca98fd7 100644
--- a/lib/Jifty/Request.pm
+++ b/lib/Jifty/Request.pm
@@ -182,12 +182,18 @@ sub promote {
     die Carp::longmess("old calling style") unless ref $req;
 
     # Import all props from Plack::Request object
+
+    # path of $req->uri is escaped by Plack::Request, we want it unescaped here
+    # see also http://github.com/miyagawa/Plack/commit/a01c607cb6d0b6470308987cb94aa4b011c2d7ff
+    my $uri = $req->uri;
+    $uri->path( URI::Escape::uri_unescape( $uri->path ) );
+
     my $self = $class->new( env => $req->env,
                             headers => $req->headers,
                             parameters => $req->parameters->mixed,
                             uploads => $req->uploads->mixed,
                             scheme => $req->scheme,
-                            uri => $req->uri,
+                            uri => $uri,
                             request_uri => $req->request_uri,
                             cookies => $req->cookies,
                             actions => {},

commit c144471c4bbca7afbd6a3dfaeec7b728e61a091f
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Jul 16 08:35:47 2010 +0800

    require Plack 0.9940 because the req->uri escape thing

diff --git a/Makefile.PL b/Makefile.PL
index 534d964..c23a145 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -70,7 +70,7 @@ requires('Module::Refresh');
 requires('Module::ScanDeps');
 requires('Object::Declare' => '0.13');
 requires('Params::Validate');
-requires('Plack' => '0.9910'); # Plack::Loader Plack::Test Plack::Util Plack::Builder Plack::Request Plack::Handler::FCGI HTTP::Message::PSGI Plack::Response
+requires('Plack' => '0.9940'); # Plack::Loader Plack::Test Plack::Util Plack::Builder Plack::Request Plack::Handler::FCGI HTTP::Message::PSGI Plack::Response
 requires('Plack::Middleware::Deflater');
 requires('Scalar::Defer' => '0.12');
 requires('Shell::Command');

-----------------------------------------------------------------------