From ca5dc87aec7950cfaeb32bd10510c7067aeff606 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Fri, 30 Jun 2006 20:46:54 +0000 Subject: [PATCH] AR-668 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/webdav/WebDAV.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/webdav/WebDAV.java b/source/java/org/alfresco/repo/webdav/WebDAV.java index d863fa52fc..0d27c5d608 100644 --- a/source/java/org/alfresco/repo/webdav/WebDAV.java +++ b/source/java/org/alfresco/repo/webdav/WebDAV.java @@ -21,8 +21,10 @@ import java.net.URLDecoder; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Hashtable; +import java.util.Locale; import java.util.Map; import java.util.StringTokenizer; +import java.util.TimeZone; import javax.servlet.http.HttpServletRequest; @@ -217,8 +219,10 @@ public class WebDAV private static SimpleDateFormat _creationDateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); // HTTP header date/time formatter + // NOTE: According to RFC2616 dates should always be in English and in + // the GMT timezone see http://rfc.net/rfc2616.html#p20 for details - private static SimpleDateFormat _httpDateFormatter = new SimpleDateFormat(HEADER_IF_DATE_FORMAT); + private static SimpleDateFormat _httpDateFormatter = new SimpleDateFormat(HEADER_IF_DATE_FORMAT, Locale.ENGLISH); /** * Formats the given date so that it conforms with the Last-Modified HTTP header @@ -564,6 +568,9 @@ public class WebDAV */ static { + // ensure http dates are in GMT time zone (see note above) + _httpDateFormatter.setTimeZone(TimeZone.getTimeZone("GMT")); + // Create the WebDAV to Alfresco property mapping table _propertyNameMap = new Hashtable();