[Rt-commit] rt branch, 4.0.1-releng, updated. rt-4.0.1rc1-36-gc8b9ce8

[Kevin Falcone]

The branch, 4.0.1-releng has been updated
       via  c8b9ce830a260e8e71301b29eeacdf43d4d9f725 (commit)
       via  7fe8465b13dfa6a0d5ca907dac64c50ed7d33481 (commit)
       via  ab1e5c4ba7788cec907d8e8f55abb21d6df06338 (commit)
       via  fe9cfa2d7bf0d50cdfb3760776c14031b10dae2b (commit)
       via  15d7acfad1accc2af84718e7d16272b28c51da11 (commit)
       via  04ee3f8821017e4254942fe1ef429b6232a8072b (commit)
      from  aa3144e5062237c2414fac9d7c412a15c5663c85 (commit)

Summary of changes:
 docs/web_deployment.pod |    7 ++++
 lib/RT/Interface/Web.pm |    8 ++--
 lib/RT/Test/Apache.pm   |    9 +++++
 t/web/cf_datetime.t     |   83 ++++++++++++++++++++++++++++++++---------------
 4 files changed, 77 insertions(+), 30 deletions(-)

- Log -----------------------------------------------------------------
commit 7fe8465b13dfa6a0d5ca907dac64c50ed7d33481
Merge: aa3144e ab1e5c4
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Jun 8 17:04:17 2011 -0400

    Merge branch '4.0/mod-perl-timezones' into 4.0.1-releng


commit c8b9ce830a260e8e71301b29eeacdf43d4d9f725
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Wed Jun 8 17:07:35 2011 -0400

    Include semicolons in web config validation messages
    
    People will copy and paste these wrong if they excludesemicolons

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index 597f728..11ba877 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1077,12 +1077,12 @@ sub ValidateWebConfig {
 
     if ($ENV{'rt.explicit_port'}) {
         if ($ENV{SERVER_PORT} != $ENV{'rt.explicit_port'}) {
-            $RT::Logger->warn("The actual SERVER_PORT ($ENV{SERVER_PORT}) does NOT match the requested port ($ENV{'rt.explicit_port'}). Perhaps you should Set(\$WebPort, $ENV{SERVER_PORT}) in RT_SiteConfig.pm, otherwise your internal links may be broken.");
+            $RT::Logger->warn("The actual SERVER_PORT ($ENV{SERVER_PORT}) does NOT match the requested port ($ENV{'rt.explicit_port'}). Perhaps you should Set(\$WebPort, $ENV{SERVER_PORT}); in RT_SiteConfig.pm, otherwise your internal links may be broken.");
         }
     }
     else {
         if ($ENV{SERVER_PORT} != RT->Config->Get('WebPort')) {
-            $RT::Logger->warn("The actual SERVER_PORT ($ENV{SERVER_PORT}) does NOT match the configured WebPort ($RT::WebPort). Perhaps you should Set(\$WebPort, $ENV{SERVER_PORT}) in RT_SiteConfig.pm, otherwise your internal links may be broken.");
+            $RT::Logger->warn("The actual SERVER_PORT ($ENV{SERVER_PORT}) does NOT match the configured WebPort ($RT::WebPort). Perhaps you should Set(\$WebPort, $ENV{SERVER_PORT}); in RT_SiteConfig.pm, otherwise your internal links may be broken.");
         }
     }
 
@@ -1091,12 +1091,12 @@ sub ValidateWebConfig {
         my ($host) = $ENV{HTTP_HOST} =~ /^(.*?)(:\d+)?$/;
 
         if ($host ne RT->Config->Get('WebDomain')) {
-            $RT::Logger->warn("The actual HTTP_HOST ($host) does NOT match the configured WebDomain ($RT::WebDomain). Perhaps you should Set(\$WebDomain, '$host') in RT_SiteConfig.pm, otherwise your internal links may be broken.");
+            $RT::Logger->warn("The actual HTTP_HOST ($host) does NOT match the configured WebDomain ($RT::WebDomain). Perhaps you should Set(\$WebDomain, '$host'); in RT_SiteConfig.pm, otherwise your internal links may be broken.");
         }
     }
     else {
         if ($ENV{SERVER_NAME} ne RT->Config->Get('WebDomain')) {
-            $RT::Logger->warn("The actual SERVER_NAME ($ENV{SERVER_NAME}) does NOT match the configured WebDomain ($RT::WebDomain). Perhaps you should Set(\$WebDomain, '$ENV{SERVER_NAME}') in RT_SiteConfig.pm, otherwise your internal links may be broken.");
+            $RT::Logger->warn("The actual SERVER_NAME ($ENV{SERVER_NAME}) does NOT match the configured WebDomain ($RT::WebDomain). Perhaps you should Set(\$WebDomain, '$ENV{SERVER_NAME}'); in RT_SiteConfig.pm, otherwise your internal links may be broken.");
         }
     }
 

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