antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Allow applications to explicitly set the HTTP status code with res.redirect().

Browse source
This commit is contained in:
hns 2009-02-02 15:35:00 +00:00
parent ca1aa7f02c
commit 99cfdfd6f6
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helma/servlet/AbstractServletClient.java
View file

@ -311,7 +311,7 @@ public abstract class AbstractServletClient extends HttpServlet {
} }
if (hopres.getRedirect() != null) { if (hopres.getRedirect() != null) {
sendRedirect(req, res, hopres.getRedirect()); sendRedirect(req, res, hopres.getRedirect(), hopres.getStatus());
} else if (hopres.getNotModified()) { } else if (hopres.getNotModified()) {
res.setStatus(HttpServletResponse.SC_NOT_MODIFIED); res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
} else { } else {
@ -383,7 +383,7 @@ public abstract class AbstractServletClient extends HttpServlet {
} }
} }
void sendRedirect(HttpServletRequest req, HttpServletResponse res, String url) { void sendRedirect(HttpServletRequest req, HttpServletResponse res, String url, int status) {
String location = url; String location = url;
if (url.indexOf("://") == -1) { if (url.indexOf("://") == -1) {
@ -421,8 +421,11 @@ public abstract class AbstractServletClient extends HttpServlet {
location = loc.toString(); location = loc.toString();
} }
// send status code 303 for HTTP 1.1, 302 otherwise // if status code was explicitly set use that, or use 303 for HTTP 1.1,
if (isOneDotOne(req.getProtocol())) { // 302 for earlier protocol versions
if (status >= 301 && status <= 303) {
res.setStatus(status);
} else if (isOneDotOne(req.getProtocol())) {
res.setStatus(HttpServletResponse.SC_SEE_OTHER); res.setStatus(HttpServletResponse.SC_SEE_OTHER);
} else { } else {
res.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY); res.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY);