Author: sshyrkov
Date: Mon Oct 8 18:24:40 2007
New Revision: 18785
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18785&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-5-0-SP-BRANCH/core/src/java/org/apache/slide/webdav/Jahi=
aWebdavServlet.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/apache/slide/webda=
v/JahiaWebdavServlet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/apache/slide/webdav/JahiaWebdavServlet.java&rev=
=3D18785&repname=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-5-0-SP-BRANCH/core/src/java/org/apache/slide/webdav/Jahi=
aWebdavServlet.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/apache/slide/webdav/Jahi=
aWebdavServlet.java Mon Oct 8 18:24:40 2007
@@ -67,7 +67,6 @@
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
-import java.text.SimpleDateFormat;
=
/**
* The WebDAV servlet. It is responsible for dispatching incoming requests=
to
@@ -138,7 +137,6 @@
=
ServicesRegistry.getInstance().getSchedulerService().startRequest(=
);
=
- SimpleDateFormat sdf =3D new SimpleDateFormat();
long start =3D System.currentTimeMillis();
String user =3D "guest";
if (req.getUserPrincipal()!=3D null) {
@@ -353,6 +351,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);
}
@@ -366,6 +365,7 @@
}
} else {
res.setStatus(WebdavStatus.SC_NOT_FOUND);
+ setHtmlContentType(res);
RequestDispatcher r =3D req.getRequestDispatcher("/jsp/jahia/e=
rrors/error_404.jsp");
r.include(req,res);
}
@@ -390,6 +390,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);
@@ -476,6 +477,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
