rt 4.2.13 ticket#13852

10 files changed, 40 insertions, 39 deletions

diff --git a/rt/devel/tools/change-loc-msgstr b/rt/devel/tools/change-loc-msgstr
index 85780de..a8cb705 100644
--- a/rt/devel/tools/change-loc-msgstr
+++ b/rt/devel/tools/change-loc-msgstr
@@ -3,7 +3,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/cmd-boilerplate b/rt/devel/tools/cmd-boilerplate
index 3e8c1bf..c4a39e2 100644
--- a/rt/devel/tools/cmd-boilerplate
+++ b/rt/devel/tools/cmd-boilerplate
@@ -5,7 +5,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/css_tidy b/rt/devel/tools/css_tidy
index a494149..7aae405 100644
--- a/rt/devel/tools/css_tidy
+++ b/rt/devel/tools/css_tidy
@@ -3,7 +3,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/extract-message-catalog b/rt/devel/tools/extract-message-catalog
index 5dd89b8..aba2d8c 100644
--- a/rt/devel/tools/extract-message-catalog
+++ b/rt/devel/tools/extract-message-catalog
@@ -3,7 +3,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/license_tag b/rt/devel/tools/license_tag
index b9d7192..b66a753 100644
--- a/rt/devel/tools/license_tag
+++ b/rt/devel/tools/license_tag
@@ -5,7 +5,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -54,7 +54,7 @@ my $LICENSE  = <<'EOL';
 
 COPYRIGHT:
 
-This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
                                          <sales@bestpractical.com>
 
 (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/rt-apache b/rt/devel/tools/rt-apache
index 23290a0..58743fd 100644
--- a/rt/devel/tools/rt-apache
+++ b/rt/devel/tools/rt-apache
@@ -4,7 +4,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -282,6 +282,29 @@ Defaults to F</usr/lib/apache2/modules>.
 =cut
 
 __DATA__
+Listen $PORT
+<IfDefine SSL>
+   Listen $SSL
+</IfDefine>
+
+ServerName localhost
+ServerRoot $RTHOME/var
+PidFile    $RTHOME/var/apache2.pid
+<IfVersion < 2.4>
+    LockFile   $RTHOME/var/apache2.lock
+</IfVersion>
+ServerAdmin root@localhost
+
+<IfVersion >= 2.4>
+    LoadModule mpm_prefork_module $MODULES/mod_mpm_prefork.so
+    LoadModule authz_core_module $MODULES/mod_authz_core.so
+</IfVersion>
+LoadModule authz_host_module  $MODULES/mod_authz_host.so
+LoadModule env_module         $MODULES/mod_env.so
+LoadModule alias_module       $MODULES/mod_alias.so
+LoadModule mime_module        $MODULES/mod_mime.so
+TypesConfig $TOOLS/mime.types
+
 <IfDefine SINGLE>
     <IfModule mpm_prefork_module>
         StartServers          1
@@ -302,23 +325,6 @@ __DATA__
     </IfModule>
 </IfDefine>
 
-Listen $PORT
-<IfDefine SSL>
-   Listen $SSL
-</IfDefine>
-
-ServerName localhost
-ServerRoot $RTHOME/var
-PidFile    $RTHOME/var/apache2.pid
-LockFile   $RTHOME/var/apache2.lock
-ServerAdmin root@localhost
-
-LoadModule authz_host_module  $MODULES/mod_authz_host.so
-LoadModule env_module         $MODULES/mod_env.so
-LoadModule alias_module       $MODULES/mod_alias.so
-LoadModule mime_module        $MODULES/mod_mime.so
-TypesConfig $TOOLS/mime.types
-
 <IfDefine PERL>
     LoadModule perl_module    $MODULES/mod_perl.so
 </IfDefine>
@@ -330,6 +336,9 @@ TypesConfig $TOOLS/mime.types
 </IfDefine>
 <IfDefine SSL>
     LoadModule ssl_module     $MODULES/mod_ssl.so
+    <IfVersion >= 2.4>
+        LoadModule socache_shmcb_module $MODULES/mod_socache_shmcb.so
+    </IfVersion>
 </IfDefine>
 
 <IfModule !log_config_module>
@@ -365,8 +374,6 @@ Alias $PATH/NoAuth/images/ $RTHOME/share/html/NoAuth/images/
 <IfDefine PERL>
     PerlSetEnv RT_SITE_CONFIG $RTHOME/etc/RT_SiteConfig.pm
     <Location $PATH>
-        Order allow,deny
-        Allow from all
         SetHandler modperl
         PerlResponseHandler Plack::Handler::Apache2
         PerlSetVar psgi_app $RTHOME/sbin/rt-server
@@ -383,8 +390,6 @@ Alias $PATH/NoAuth/images/ $RTHOME/share/html/NoAuth/images/
     FastCgiServer $RTHOME/sbin/rt-server.fcgi -processes $PROCESSES -idle-timeout 300
     ScriptAlias $PATH $RTHOME/sbin/rt-server.fcgi/
     <Location $PATH>
-        Order allow,deny
-        Allow from all
         Options +ExecCGI
         AddHandler fastcgi-script fcgi
     </Location>
@@ -397,8 +402,6 @@ Alias $PATH/NoAuth/images/ $RTHOME/share/html/NoAuth/images/
     FcgidMaxRequestLen 1073741824
     ScriptAlias $PATH $RTHOME/sbin/rt-server.fcgi/
     <Location $PATH>
-        Order allow,deny
-        Allow from all
         Options +ExecCGI
         AddHandler fcgid-script fcgi
     </Location>
@@ -426,8 +429,6 @@ Alias $PATH/NoAuth/images/ $RTHOME/share/html/NoAuth/images/
     FastCgiServer $RTHOME/bin/mason_handler.fcgi -processes $PROCESSES -idle-timeout 300
     ScriptAlias $PATH $RTHOME/bin/mason_handler.fcgi/
     <Location $PATH>
-        Order allow,deny
-        Allow from all
         Options +ExecCGI
         AddHandler fastcgi-script fcgi
     </Location>
@@ -440,8 +441,6 @@ Alias $PATH/NoAuth/images/ $RTHOME/share/html/NoAuth/images/
     FcgidMaxRequestLen 1073741824
     ScriptAlias $PATH $RTHOME/bin/mason_handler.fcgi/
     <Location $PATH>
-        Order allow,deny
-        Allow from all
         Options +ExecCGI
         AddHandler fcgid-script fcgi
     </Location>
@@ -454,7 +453,9 @@ Alias $PATH/NoAuth/images/ $RTHOME/share/html/NoAuth/images/
     SSLRandomSeed connect builtin
     SSLRandomSeed connect file:/dev/urandom 512
     SSLSessionCache shmcb:$RTHOME/var/ssl_scache(512000)
-    SSLMutex file:$RTHOME/var/ssl_mutex
+    <IfVersion < 2.4>
+        SSLMutex file:$RTHOME/var/ssl_mutex
+    </IfVersion>
     <VirtualHost *:$SSL>
         SSLEngine on
         SSLCertificateFile    $TOOLS/localhost.crt
diff --git a/rt/devel/tools/rt-attributes-editor b/rt/devel/tools/rt-attributes-editor
index cc69a02..9b16196 100644
--- a/rt/devel/tools/rt-attributes-editor
+++ b/rt/devel/tools/rt-attributes-editor
@@ -3,7 +3,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/rt-message-catalog b/rt/devel/tools/rt-message-catalog
index f1a3158..3c92306 100644
--- a/rt/devel/tools/rt-message-catalog
+++ b/rt/devel/tools/rt-message-catalog
@@ -3,7 +3,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/rt-static-docs b/rt/devel/tools/rt-static-docs
index c8038c0..e9fdcc6 100644
--- a/rt/devel/tools/rt-static-docs
+++ b/rt/devel/tools/rt-static-docs
@@ -3,7 +3,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/tweak-template-locstring b/rt/devel/tools/tweak-template-locstring
index c2741ab..8e7c808 100644
--- a/rt/devel/tools/tweak-template-locstring
+++ b/rt/devel/tools/tweak-template-locstring
@@ -3,7 +3,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)