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 545d85f..6e3dc01 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -58,17 +58,7 @@ import java.util.Locale;
  * Mir.java - main servlet, that dispatches to servletmodules
  *
  * @author $Author: mh $
- * @version $Revision: 1.17.2.2 $ $Date: 2002/11/25 21:59:47 $
- *
- * $Log: Mir.java,v $
- * Revision 1.17.2.2  2002/11/25 21:59:47  mh
- * use req.getContextPath to find the RootUri.. much more robust. 4.0 and 4.1 compatible due to new web.xml mapping
- *
- * Revision 1.17.2.1  2002/09/01 21:31:39  mh
- * Mir goes GPL
- *
- * Revision 1.17  2002/07/21 22:27:39  mh
- * make the user error msg look nicer
+ * @version $Revision: 1.17.2.5 $ $Date: 2002/12/10 21:10:16 $
  *
  */
 
@@ -109,8 +99,12 @@ public class Mir extends AbstractServlet {
         session = req.getSession(true);
 
         if (req.getServerPort() == 443) http = "https"; else http = "http";
+
+        //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);