[Rt-commit] rt branch, 4.0/apache2-fixes, updated. rt-4.0.0rc5-7-g4cf5495

[Chia-liang Kao]

The branch, 4.0/apache2-fixes has been updated
       via  4cf549532e67bc906b5253c505ff61fb5601f661 (commit)
       via  a94fd2c9760b1e82d2513bc2601f9fae513d3059 (commit)
      from  cdf8ba3485a70a37d1e4cd20a1e3aa6366ed16bf (commit)

Summary of changes:
 lib/RT/Test.pm               |    2 +-
 sbin/rt-server.in            |    2 +-
 sbin/rt-test-dependencies.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit a94fd2c9760b1e82d2513bc2601f9fae513d3059
Author: Chia-liang Kao <clkao at bestpractical.com>
Date:   Thu Feb 24 21:16:11 2011 +0800

    Use more reliable way to distinguish rt-server being used as psgi file, and don't depend on future plack.

diff --git a/sbin/rt-server.in b/sbin/rt-server.in
index afef62c..829a7f0 100755
--- a/sbin/rt-server.in
+++ b/sbin/rt-server.in
@@ -155,7 +155,7 @@ if ($ENV{RT_TESTING}) {
 }
 
 # when used as a psgi file
-unless ($0 eq __FILE__) {
+unless (__PACKAGE__ eq 'main') {
     return $app;
 }
 
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index 36d9196..8ddcfad 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -238,7 +238,7 @@ $deps{'PSGI'} = [ text_to_hash( << '.') ];
 CGI 3.38
 CGI::PSGI 0.12
 HTML::Mason::PSGIHandler 0.52
-Plack 0.9972
+Plack 0.9971
 Plack::Handler::Starlet
 CGI::Emulate::PSGI
 .

commit 4cf549532e67bc906b5253c505ff61fb5601f661
Author: Chia-liang Kao <clkao at bestpractical.com>
Date:   Thu Feb 24 21:54:56 2011 +0800

    Make web/squish tests pass for apache

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index c6478a5..85a1601 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -313,7 +313,7 @@ sub set_config_wrapper {
     no warnings 'redefine';
     *RT::Config::Set = sub {
         my @caller = caller;
-        if ( ($caller[1]||'') =~ /\.t$/ ) {
+        if ( ($caller[1]||'') =~ /\.t$/ || ((caller(1))[3] || '') =~ m/Add(JavaScript|StyleSheets)/) {
             my ($self, $name) = @_;
             my $type = $RT::Config::META{$name}->{'Type'} || 'SCALAR';
             my %sigils = (

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