svn commit: [jahia] r18208 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/filters/zimbra/SetHeaderFilter.java

[cmailleux]

Author: cmailleux
Date: Mon Aug 20 15:04:50 2007
New Revision: 18208

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18208&repname=
=3Djahia
Log:
Correctly set Expires Header ont http request (ASCII chars only)

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/filters/zimbra=
/SetHeaderFilter.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/filters/=
zimbra/SetHeaderFilter.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/bin/filters/zimbra/SetHeaderFilter.java&rev=
=3D18208&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/jahia/bin/filters/zimbra=
/SetHeaderFilter.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/bin/filters/zimbra=
/SetHeaderFilter.java Mon Aug 20 15:04:50 2007
@@ -17,6 +17,8 @@
  */
 package org.jahia.bin.filters.zimbra;
 =

+import org.org.apache.commons.httpclient.util.DateUtil;
+
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -26,6 +28,7 @@
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.TimeZone;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 =

@@ -372,16 +375,16 @@
 =

     private void setStaticResourceCacheControlHeaders(HttpServletResponse =
resp) {
         if (expiresValue > 0) {
-            logger.debug("is static file: set static cache-control");
+            if(logger.isDebugEnabled()) logger.debug("is static file: set =
static cache-control");
             final TimeZone gmt =3D TimeZone.getTimeZone(GMT);
             final long now =3D System.currentTimeMillis();
             final Date expiresDate =3D new Date(now + (expiresValue * 1000=
));
-            final DateFormat df =3D new SimpleDateFormat(TIME_FORMAT);
+            final DateFormat df =3D new SimpleDateFormat(DateUtil.PATTERN_=
RFC1123, Locale.US);
             df.setTimeZone(gmt);
-            logger.debug("expire:"+df.format(expiresDate));
+            if(logger.isDebugEnabled()) logger.debug("expire:"+df.format(e=
xpiresDate));
             resp.setHeader(HEADER_EXPIRES, df.format(expiresDate) + " " + =
GMT);
             if(futureCacheControl!=3Dnull){
-            logger.debug("cache-control:"+futureCacheControl);
+            if(logger.isDebugEnabled()) logger.debug("cache-control:"+futu=
reCacheControl);
             resp.setHeader(HEADER_CACHE_CONTROL, futureCacheControl);
             }
         }

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list