[Jifty-commit] jifty branch, master, updated. 1.10518-59-gf502aa6

[Jifty commits]

The branch, master has been updated
       via  f502aa612ade8db7a5c7faac539bfc4511b294d4 (commit)
       via  3f4fa1443b57068d43b393d318622acdbdd96cab (commit)
      from  9054271fd7ffe410569d976659d986366727c0d3 (commit)

Summary of changes:
 lib/Jifty.pm              |    2 +-
 lib/Jifty/Continuation.pm |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 3f4fa1443b57068d43b393d318622acdbdd96cab
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Nov 7 17:50:30 2011 -0500

    Preserve current request headers when returning from a continuation
    
    Request headers aren't pulled from env, they are a separate object.

diff --git a/lib/Jifty/Continuation.pm b/lib/Jifty/Continuation.pm
index 6701fd6..1a344e5 100644
--- a/lib/Jifty/Continuation.pm
+++ b/lib/Jifty/Continuation.pm
@@ -249,13 +249,17 @@ sub return {
 
     # We want to preserve the current actual request environment
     # (headers, etc)
-    my $env = Jifty->web->request->top_request->env;
+    my $env     = Jifty->web->request->top_request->env;
+    my $headers = Jifty->web->request->top_request->headers;
+    # XXX TODO: should we be saving cookies too since they're no longer pulled
+    # from env as of 1d90579c4448ceba113fae1bbdfd515c021b5ae0?
 
     # Set the current request to the one in the continuation
     Jifty->web->request($self->request->clone);
 
     # Restore the environment we came in with
     Jifty->web->request->top_request->{env} = $env;
+    Jifty->web->request->top_request->headers($headers);
     Jifty->web->request->setup_subrequest_env
         if Jifty->web->request->is_subrequest;
 

commit f502aa612ade8db7a5c7faac539bfc4511b294d4
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Nov 7 17:56:35 2011 -0500

    Bump version for external deps

diff --git a/lib/Jifty.pm b/lib/Jifty.pm
index 033650e..5d3d683 100644
--- a/lib/Jifty.pm
+++ b/lib/Jifty.pm
@@ -13,7 +13,7 @@ BEGIN {
     require Time::Local;
 
     # Declare early to make sure Jifty::Record::schema_version works
-    $Jifty::VERSION = '1.10609';
+    $Jifty::VERSION = '1.11107';
 }
 
 =head1 NAME

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