Author: alexsmirnov
Date: 2008-04-28 15:24:33 -0400 (Mon, 28 Apr 2008)
New Revision: 8268
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java
Log:
Fix
http://jira.jboss.com/jira/browse/RF-3159
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java
===================================================================
---
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2008-04-28
19:13:32 UTC (rev 8267)
+++
trunk/framework/impl/src/main/java/org/ajax4jsf/resource/InternetResourceBase.java 2008-04-28
19:24:33 UTC (rev 8268)
@@ -386,16 +386,16 @@
}
// context.setHeader("Content-Type",getContentType());
context.setContentType(getContentType(context));
- if (!cached && getContentLength(context) > 0) {
- context.setIntHeader("Content-Length", getContentLength(context));
- } else {
- // context.setHeader("Transfer-Encoding", "chunked");
- }
Date lastModified = getLastModified(context);
if (lastModified != null) {
context.setDateHeader("Last-Modified", lastModified.getTime());
}
+ int contentLength = getContentLength(context);
if (cached) {
+ if (contentLength > 0) {
+ context.setIntHeader("Content-Length",
+ contentLength);
+ }
Date expired = getExpired(context);
if (expired != null) {
context.setDateHeader("Expires", expired.getTime());
@@ -406,6 +406,12 @@
+ (DEFAULT_EXPIRE / 1000));
}
} else {
+ if (contentLength > 0) {
+ context.setIntHeader("Content-Length",
+ contentLength);
+ } else {
+ context.setHeader("Transfer-Encoding", "chunked");
+ }
context.setHeader("Cache-control", "max-age=0, no-store,
no-cache");
context.setHeader("Pragma", "no-cache");
context.setIntHeader("Expires", 0);