fix intermittent 900 NET OR SSL error, RT#42648

[freeside.git] / htetc / freeside-base2.conf

diff --git a/htetc/freeside-base2.conf b/htetc/freeside-base2.conf
index 76e7997..1504266 100644 (file)
--- a/htetc/freeside-base2.conf
+++ b/htetc/freeside-base2.conf
@@ -8,31 +8,44 @@ PerlModule HTML::Mason::ApacheHandler
 
 PerlRequire "%%%MASON_HANDLER%%%"
 
+PerlChildInitHandler FS::Mason::child_init
+
 #Locale::SubCountry
-AddDefaultCharset ISO-8859-1
+AddDefaultCharset UTF-8
 
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
-AuthName Freeside
-AuthType Basic
-AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
-require valid-user
-<Files ~ "(\.cgi|\.html)$">
-SetHandler perl-script
-PerlHandler HTML::Mason
-</Files>
+
+    AuthName Freeside
+    AuthType Basic
+    AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
+    require valid-user
+
+    <Files ~ "(\.cgi|\.html)$">
+        SetHandler perl-script
+        PerlHandler HTML::Mason
+    </Files>
+
 </Directory>
+
+<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/elements/>
+    <Files ~ "(\.html)$">
+        Deny from all
+        SetHandler None
+    </Files>
+</Directory>
+
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/>
-SetHandler perl-script
-PerlHandler HTML::Mason
+    SetHandler perl-script
+    PerlHandler HTML::Mason
 </Directory>
 
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%/loginout>
-AuthName Freeside
-AuthType Basic
-AuthUserFile %%%FREESIDE_CONF%%%/htpasswd.logout
-require valid-user
-<Files ~ "(\.cgi|\.html)$">
-SetHandler default-handler
-</Files>
+    AuthName Freeside
+    AuthType Basic
+    AuthUserFile %%%FREESIDE_CONF%%%/htpasswd.logout
+    require valid-user
+    <Files ~ "(\.cgi|\.html)$">
+        SetHandler default-handler
+    </Files>
 </Directory>