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

[Jifty commits]

The branch, master has been updated
       via  bbd5a22caa118517ceb557976b0cb57d6fb22cb7 (commit)
      from  dbbfa1adc33a1ed9cdc02134a29e6010855989d3 (commit)

Summary of changes:
 lib/Jifty/Plugin/CompressedCSSandJS/Dispatcher.pm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit bbd5a22caa118517ceb557976b0cb57d6fb22cb7
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Jan 28 23:44:32 2010 -0500

    Only abort with a status if it's not 200
    
    If it's 200, we've already printed content.  Otherwise, we haven't.

diff --git a/lib/Jifty/Plugin/CompressedCSSandJS/Dispatcher.pm b/lib/Jifty/Plugin/CompressedCSSandJS/Dispatcher.pm
index 0cbfeaa..603cada 100644
--- a/lib/Jifty/Plugin/CompressedCSSandJS/Dispatcher.pm
+++ b/lib/Jifty/Plugin/CompressedCSSandJS/Dispatcher.pm
@@ -34,7 +34,8 @@ on '/__jifty/js/*' => run {
 
     $arg =~ s/\.js$//;
     my $status = Jifty::CAS->serve_by_name( 'ccjs', 'js-all', $arg );
-    abort $status;
+    abort $status if $status != 200;
+    abort;
 };
 
 on '/__jifty/css/*' => run {
@@ -51,7 +52,8 @@ on '/__jifty/css/*' => run {
 
     $arg =~ s/\.css$//;
     my $status = Jifty::CAS->serve_by_name( 'ccjs', 'css-all', $arg );
-    abort $status;
+    abort $status if $status != 200;
+    abort;
 };
 
 1;

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