[Rt-commit] rt branch, psgi, updated. rt-3.9.4-217-ga35025d

[Chia-liang Kao]

The branch, psgi has been updated
       via  a35025d646e85cb05f5ae2c2f15e2322e1a4fcb5 (commit)
       via  9e988131a0b8a31437ceb46688de595d011a362b (commit)
      from  241134d16929e8e644542b173e27fb3fcb20e1a6 (commit)

Summary of changes:
 sbin/rt-server.in            |   10 +++++-----
 sbin/rt-test-dependencies.in |    1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 9e988131a0b8a31437ceb46688de595d011a362b
Author: Chia-liang Kao <clkao at bestpractical.com>
Date:   Tue Oct 26 09:27:01 2010 +0800

    requires latest CGI::PSGI which fixes fcgi

diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index 00d49bf..f86a86b 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -229,6 +229,7 @@ IPC::Run3
 .
 
 $deps{'PSGI'} = [ text_to_hash( << '.') ];
+CGI::PSGI 0.12
 HTML::Mason::PSGIHandler 0.52
 Plack
 Test::WWW::Mechanize::PSGI

commit a35025d646e85cb05f5ae2c2f15e2322e1a4fcb5
Author: Chia-liang Kao <clkao at bestpractical.com>
Date:   Tue Oct 26 09:27:11 2010 +0800

    Wrap earlier for stashwarnings.

diff --git a/sbin/rt-server.in b/sbin/rt-server.in
index 5ea5573..60decff 100755
--- a/sbin/rt-server.in
+++ b/sbin/rt-server.in
@@ -131,13 +131,13 @@ EOF
 require RT::Interface::Web::Handler;
 my $app = RT::Interface::Web::Handler->PSGIApp;
 
+if ($ENV{RT_TESTING}) {
+    require Plack::Middleware::Test::StashWarnings;
+    $app = Plack::Middleware::Test::StashWarnings->wrap($app);
+}
+
 # when used as a psgi file
 unless ($0 eq __FILE__) {
-    if ($ENV{RT_TESTING}) {
-        require Plack::Middleware::Test::StashWarnings;
-        $app = Plack::Middleware::Test::StashWarnings->wrap($app);
-    }
-
     return $app;
 }
 

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