Author: sshyrkov
Date: Mon Oct  8 18:24:19 2007
New Revision: 18784

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18784&repname=
=3Djahia
Log:
ECRI-25: d=C3=A9sactiver le listings des r=C3=A9pertoires
http://www.jahia.net/jira/browse/ECRI-25
Resolution: set proper response content type for error pages

Modified:
    branches/JAHIA-4-1-BRANCH/src/java/org/apache/slide/webdav/JahiaWebdavS=
ervlet.java

Modified: branches/JAHIA-4-1-BRANCH/src/java/org/apache/slide/webdav/JahiaW=
ebdavServlet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java&rev=3D18784&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/apache/slide/webdav/JahiaWebdavS=
ervlet.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/apache/slide/webdav/JahiaWebdavS=
ervlet.java Mon Oct  8 18:24:19 2007
@@ -321,6 +321,7 @@
                         res.sendError(HttpServletResponse.SC_UNAUTHORIZED);
                     } else {
                         res.setStatus(WebdavStatus.SC_FORBIDDEN);
+                        setHtmlContentType(res);
                         RequestDispatcher r =3D req.getRequestDispatcher("=
/jsp/jahia/errors/error_403.jsp");
                         r.include(req,res);
                     }
@@ -334,6 +335,7 @@
             }
         } else {
             res.setStatus(WebdavStatus.SC_FORBIDDEN);
+            setHtmlContentType(res);
             RequestDispatcher r =3D req.getRequestDispatcher("/jsp/jahia/e=
rrors/error_403.jsp");
             r.include(req,res);
         }
@@ -358,6 +360,7 @@
                             super.sendError(HttpServletResponse.SC_UNAUTHO=
RIZED);
                         } else {
                             resp.setStatus(WebdavStatus.SC_FORBIDDEN);
+                            setHtmlContentType(resp);
                             RequestDispatcher r =3D req.getRequestDispatch=
er("/jsp/jahia/errors/error_403.jsp");
                             try {
                                 r.include(req,resp);
@@ -438,6 +441,10 @@
         return null;
     }
 =

+    private void setHtmlContentType(HttpServletResponse response) {
+        response.setContentType("text/html;charset=3D"
+                + Jahia.getSettings().getDefaultResponseBodyEncoding());
+    }
 =

     static boolean isDomLevel2Parser() {
         try {

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to