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

Only set response to 304 not modified if no cookies were set.

Browse source 
Apache will not set cookies in a 304 response.
This commit is contained in:
hns 2005-04-14 16:27:37 +00:00
parent 00070358f9
commit 2b916bc2df
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/helma/framework/ResponseTrans.java
View file

@ -520,8 +520,8 @@ public final class ResponseTrans implements Serializable {
} }
} }
// if etag is not set, calc MD5 digest and check it // if etag is not set, calc MD5 digest and check it, but only if not a redirect
if ((etag == null) && (lastModified == -1) && (redir == null)) { if (etag == null && lastModified == -1 && redir == null) {
try { try {
digest = MessageDigest.getInstance("MD5"); digest = MessageDigest.getInstance("MD5");
@ -531,7 +531,8 @@ public final class ResponseTrans implements Serializable {
etag = "\"" + new String(Base64.encode(b)) + "\""; etag = "\"" + new String(Base64.encode(b)) + "\"";
if ((reqtrans != null) && reqtrans.hasETag(etag)) { // only set response to 304 not modified if no cookies were set
if (reqtrans != null && reqtrans.hasETag(etag) && countCookies() == 0) {
response = new byte[0]; response = new byte[0];
notModified = true; notModified = true;
} }