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

* Implement conditional GET based on file last modified date in sendForward().

Browse source
This commit is contained in:
hns 2006-05-18 18:25:14 +00:00
parent 7b232f7eb1
commit c8a3c3d702
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -355,7 +355,7 @@ public abstract class AbstractServletClient extends HttpServlet {
void writeResponse(HttpServletRequest req, HttpServletResponse res, void writeResponse(HttpServletRequest req, HttpServletResponse res,
ResponseTrans hopres) throws IOException { ResponseTrans hopres) throws IOException {
if (hopres.getForward() != null) { if (hopres.getForward() != null) {
sendForward(res, hopres); sendForward(res, req, hopres);
return; return;
} }
@ -484,8 +484,8 @@ public abstract class AbstractServletClient extends HttpServlet {
* Forward the request to a static file. The file must be reachable via * Forward the request to a static file. The file must be reachable via
* the context's protectedStatic resource base. * the context's protectedStatic resource base.
*/ */
void sendForward(HttpServletResponse res, ResponseTrans hopres) throws IOException { void sendForward(HttpServletResponse res, HttpServletRequest req,
ResponseTrans hopres) throws IOException {
String forward = hopres.getForward(); String forward = hopres.getForward();
ServletContext cx = getServletConfig().getServletContext(); ServletContext cx = getServletConfig().getServletContext();
String path = cx.getRealPath(forward); String path = cx.getRealPath(forward);
@ -493,8 +493,17 @@ public abstract class AbstractServletClient extends HttpServlet {
throw new IOException("Resource "+forward+" not found"); throw new IOException("Resource "+forward+" not found");
File file = new File(path); File file = new File(path);
// check last modified date.
// date headers don't do milliseconds, round to seconds
long lastModified = (file.lastModified() / 1000) * 1000;
long ifModifiedSince = req.getDateHeader("If-Modified-Since");
if (lastModified == ifModifiedSince) {
res.setStatus(304);
return;
}
int length = (int) file.length(); int length = (int) file.length();
res.setContentLength(length); res.setContentLength(length);
res.setDateHeader("Last-Modified", lastModified);
res.setContentType(hopres.getContentType()); res.setContentType(hopres.getContentType());
InputStream in = cx.getResourceAsStream(forward); InputStream in = cx.getResourceAsStream(forward);
@ -505,7 +514,7 @@ public abstract class AbstractServletClient extends HttpServlet {
int bufferSize = 4096; int bufferSize = 4096;
byte buffer[] = new byte[bufferSize]; byte buffer[] = new byte[bufferSize];
int l = bufferSize; int l;
while (length>0) { while (length>0) {
if (length < bufferSize) if (length < bufferSize)