fix bug where Mir.DefaultEncoding (the java one) was being sent out int the content...

[mir.git] / source / Mir.java

diff --git a/source/Mir.java b/source/Mir.java
index 3149f83..6e3dc01 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -58,7 +58,7 @@ import java.util.Locale;
  * Mir.java - main servlet, that dispatches to servletmodules
  *
  * @author $Author: mh $
- * @version $Revision: 1.17.2.3 $ $Date: 2002/12/06 07:14:45 $
+ * @version $Revision: 1.17.2.5 $ $Date: 2002/12/10 21:10:16 $
  *
  */
 
@@ -100,15 +100,11 @@ public class Mir extends AbstractServlet {
 
         if (req.getServerPort() == 443) http = "https"; else http = "http";
 
-        //nothing in Mir can or should be cached as it's all dynamic...
-        //
-        //this needs to be done here and not per page (via meta tags) as some
-        //browsers have problems w/ it per-page -mh
-        res.setHeader("Pragma", "no-cache");
-        res.setDateHeader("Expires", 0);
-        res.setHeader("Cache-Control", "no-cache");
+        //make sure client browsers don't cache anything
+        setNoCaching(res);
+
         res.setContentType("text/html; charset="
-                            +MirConfig.getProp("Mir.DefaultEncoding"));
+                            +MirConfig.getProp("Mir.DefaultHTMLCharset"));
         String moduleName = req.getParameter("module");
 
         checkLanguage(session, req);