4 files changed, 20 insertions, 1 deletions
diff --git a/htetc/freeside-base1.99.conf b/htetc/freeside-base1.99.conf
index 8e890e646..ce3c3f240 100644
--- a/htetc/freeside-base1.99.conf
+++ b/htetc/freeside-base1.99.conf
@@ -8,6 +8,9 @@ PerlModule HTML::Mason::ApacheHandler
 
 PerlRequire "%%%MASON_HANDLER%%%"
 
+#Locale::SubCountry
+AddDefaultCharset ISO-8859-1
+
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
 AuthName Freeside
 AuthType Basic
diff --git a/htetc/freeside-base1.conf b/htetc/freeside-base1.conf
index 73962a721..7b8d9da68 100644
--- a/htetc/freeside-base1.conf
+++ b/htetc/freeside-base1.conf
@@ -2,6 +2,9 @@
 
 PerlModule HTML::Mason
 
+#Locale::SubCountry
+AddDefaultCharset ISO-8859-1
+
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
 AuthName Freeside
 AuthType Basic
diff --git a/htetc/freeside-base2.conf b/htetc/freeside-base2.conf
index 6606129d9..1cd1cc550 100644
--- a/htetc/freeside-base2.conf
+++ b/htetc/freeside-base2.conf
@@ -8,6 +8,9 @@ PerlModule HTML::Mason::ApacheHandler
 
 PerlRequire "%%%MASON_HANDLER%%%"
 
+#Locale::SubCountry
+AddDefaultCharset ISO-8859-1
+
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
 AuthName Freeside
 AuthType Basic
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 1dd16ec72..952d6203b 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -44,7 +44,8 @@ sub handler
 
     ###Module::Refresh->refresh;###
 
-    $r->content_type('text/html');
+    #$r->content_type('text/html; charset=utf-8');
+    $r->content_type('text/html; charset=iso-8859-1');
     #eorar
 
     my $headers = $r->headers_out;
@@ -69,6 +70,15 @@ sub handler
 
     } else {
 
+      local $SIG{__WARN__};
+      local $SIG{__DIE__};
+
+      RT::Init() if $RT::VERSION; #for lack of something else
+
+      #we don't want the RT error handlers under FS
+      undef $SIG{__WARN__} if defined($SIG{__WARN__});
+      undef $SIG{__DIE__}  if defined($SIG{__DIE__} );
+
       $ah->interp($fs_interp);
 
     }