[Jifty-commit] jifty branch, jifty_client, updated. 53dd537b0b7dd82a3ce3c606ba2ebdb06a17d89d

[Jifty commits]

The branch, jifty_client has been updated
       via  53dd537b0b7dd82a3ce3c606ba2ebdb06a17d89d (commit)
      from  c7fdebfc812abdaa80ecf9b751ab2b2590decb5e (commit)

Summary of changes:
 lib/Jifty/Handler.pm |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 53dd537b0b7dd82a3ce3c606ba2ebdb06a17d89d
Author: Chia-liang Kao <clkao at clkao.org>
Date:   Mon May 3 11:12:20 2010 +0800

    fix devel mode short circuit.

diff --git a/lib/Jifty/Handler.pm b/lib/Jifty/Handler.pm
index 3c08597..6487fb2 100644
--- a/lib/Jifty/Handler.pm
+++ b/lib/Jifty/Handler.pm
@@ -149,8 +149,6 @@ sub psgi_app_static {
 
     # the buffering and unsetting of psgi.streaming is to vivify the
     # responded res from the $static cascade app.
-    return $static if Jifty->config->framework('DevelMode');
-
     builder {
         enable 'Plack::Middleware::ConditionalGET';
         enable
@@ -160,6 +158,9 @@ sub psgi_app_static {
                         my $res = $app->($env);
                         # skip streamy response
                         return $res unless ref($res) eq 'ARRAY' && $res->[2];
+
+                        return $res if Jifty->config->framework('DevelMode');
+
                         my $h = Plack::Util::headers($res->[1]);;
                         $h->set( 'Cache-Control' => 'max-age=31536000, public' );
                         $h->set( 'Expires' => HTTP::Date::time2str( time() + 31536000 ) );

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