[Jifty-commit] jifty branch, plack-rebased, updated. a082947d517918dcaad0ab3dad921b2744420179

[Jifty commits]

The branch, plack-rebased has been updated
       via  a082947d517918dcaad0ab3dad921b2744420179 (commit)
       via  2131043350bfec8bb0b8f0bc878471289a25b6ef (commit)
       via  c74c4051cea29a40580b43ac0a7b442e99dcac85 (commit)
       via  f0c597a05cefb9c62e5cd8a783b2fe8114de81f6 (commit)
      from  6a40ccd8e65dc506272f2793ad69d7eab748b9a2 (commit)

Summary of changes:
 Makefile.PL                 |    2 +-
 lib/Jifty/Continuation.pm   |    1 +
 lib/Jifty/Request.pm        |    7 ++++++-
 lib/Jifty/Web.pm            |    1 +
 lib/Jifty/Web/Form.pm       |    4 +++-
 t/TestApp/t/config-Cachable |    1 +
 6 files changed, 13 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit f0c597a05cefb9c62e5cd8a783b2fe8114de81f6
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Tue Feb 23 15:36:30 2010 +0800

    Load compat plugin for the deprecation test.

diff --git a/t/TestApp/t/config-Cachable b/t/TestApp/t/config-Cachable
index 63d609d..37ab1db 100644
--- a/t/TestApp/t/config-Cachable
+++ b/t/TestApp/t/config-Cachable
@@ -6,4 +6,5 @@ framework:
   Plugins:
     - CompressedCSSandJS: {}
     - SkeletonApp: {}
+    - Compat: {}
     - Deflater: {}

commit c74c4051cea29a40580b43ac0a7b442e99dcac85
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Tue Feb 23 16:45:14 2010 +0800

    localize psgix.io to avoid serializing it in continuation.

diff --git a/lib/Jifty/Continuation.pm b/lib/Jifty/Continuation.pm
index 5d44762..e5c65e0 100644
--- a/lib/Jifty/Continuation.pm
+++ b/lib/Jifty/Continuation.pm
@@ -137,6 +137,7 @@ sub new {
     # Make sure we don't store any of the connection information
     local $self->request->{env}{"psgi.input"};
     local $self->request->{env}{"psgi.errors"};
+    local $self->request->{env}{"psgix.io"};
     local $self->request->{env}{"plack.request.tempfh"};
     local $self->request->{_body_parser}{input_handle} if defined $self->request->{_body_parser};
 

commit 2131043350bfec8bb0b8f0bc878471289a25b6ef
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Tue Feb 23 16:53:30 2010 +0800

    Fix request_uri canonicalization.

diff --git a/lib/Jifty/Request.pm b/lib/Jifty/Request.pm
index edb596f..b72fd77 100644
--- a/lib/Jifty/Request.pm
+++ b/lib/Jifty/Request.pm
@@ -23,6 +23,11 @@ has 'uri' => (is => 'rw', isa => 'URI', default => sub { URI->new('http:///') })
 has 'cookies' => (is => 'rw', isa => 'HashRef', default => sub { {} } );
 has 'scheme' => (is => "rw", isa => "Str", default => sub { 'http' });
 
+has 'request_uri' => (
+    is      => "rw",
+    isa     => "Str",
+);
+
 sub address     { $_[0]->env->{REMOTE_ADDR} }
 sub remote_host { $_[0]->env->{REMOTE_HOST} }
 sub protocol    { $_[0]->env->{SERVER_PROTOCOL} }
@@ -30,7 +35,6 @@ sub method      { $_[0]->env->{REQUEST_METHOD} = $_[1] if @_ > 1; $_[0]->env->{R
 sub request_method { Carp::carp "request_method is deprecated, use method instead"; goto \&method }
 sub port        { $_[0]->env->{SERVER_PORT} }
 sub user        { $_[0]->env->{REMOTE_USER} }
-sub request_uri { $_[0]->env->{REQUEST_URI} }
 sub path_info   { $_[0]->env->{PATH_INFO} }
 sub script_name { $_[0]->env->{SCRIPT_NAME} }
 sub secure      { $_[0]->scheme eq 'https' }
@@ -169,6 +173,7 @@ sub promote {
                             uploads => $req->uploads->mixed,
                             scheme => $req->scheme,
                             uri => $req->uri,
+                            request_uri => $req->request_uri,
                             cookies => $req->cookies,
                             actions => {},
                             state_variables => {},
diff --git a/lib/Jifty/Web.pm b/lib/Jifty/Web.pm
index 06efcb4..89312bc 100644
--- a/lib/Jifty/Web.pm
+++ b/lib/Jifty/Web.pm
@@ -713,6 +713,7 @@ sub redirect {
         # PATH_INFO, which is what $request->path is normally set to.
         # We should replicate that here.
         $request->path( URI::Escape::uri_unescape( $page->url ) );
+        $request->request_uri( URI->new($page->url)->path_query );
         $request->method("GET"); # ..effectively.
         $request->scheme($self->request->scheme);
         $request->continuation($self->request->continuation);
diff --git a/lib/Jifty/Web/Form.pm b/lib/Jifty/Web/Form.pm
index d8aae26..5095a56 100644
--- a/lib/Jifty/Web/Form.pm
+++ b/lib/Jifty/Web/Form.pm
@@ -200,7 +200,9 @@ sub start {
         }
     }
 
-    my $root = $self->submit_to || Jifty->web->request->top_request->path;
+    my $root = $self->submit_to
+      || URI->new(Jifty->web->request->top_request->request_uri)->path;
+
     my $form_start = qq!<form method="post" action="!  . Jifty->web->escape( $root ) . qq!"!;
     $form_start .= qq! name="@{[ $self->name ]}"! if defined $self->name;
     $form_start .= qq! target="@{[ $self->target ]}"! if defined $self->target;

commit a082947d517918dcaad0ab3dad921b2744420179
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Tue Feb 23 17:12:03 2010 +0800

    Update required Plack version.

diff --git a/Makefile.PL b/Makefile.PL
index 9713612..d550770 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -71,7 +71,7 @@ requires('Module::Refresh');
 requires('Module::ScanDeps');
 requires('Object::Declare' => '0.13');
 requires('Params::Validate');
-requires('Plack' => '0.99_01'); # Plack::Loader Plack::Test Plack::Util Plack::Builder Plack::Request Plack::Handler::FCGI
+requires('Plack' => '0.9910'); # Plack::Loader Plack::Test Plack::Util Plack::Builder Plack::Request Plack::Handler::FCGI
 requires('Plack::Middleware::Deflater');
 requires('Scalar::Defer' => '0.12');
 requires('Shell::Command');

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