From eb82dd44ac778de68ff7314543742f34d87c7d8c Mon Sep 17 00:00:00 2001
From: vsizikov <vsizikov@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 24 Nov 2006 20:08:18 +0000
Subject: [PATCH] Fixed ISSUE #169: "Hudson's RSS feads do not validate"

Submitted by:  Vladimir Sizikov


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1244 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/Functions.java   | 4 ++++
 core/src/main/java/hudson/Util.java        | 5 +++++
 core/src/main/resources/hudson/rss20.jelly | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 5a3a5b76aa..44e2e4c7c8 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -31,6 +31,10 @@ public class Functions {
         return Util.XS_DATETIME_FORMATTER.format(cal.getTime());
     }
 
+    public static String rfc822Date(Calendar cal) {
+        return Util.RFC822_DATETIME_FORMATTER.format(cal.getTime());
+    }
+
     public static String getDiffString(int i) {
         if(i==0)    return "\u00B10";   // +/-0
         String s = Integer.toString(i);
diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
index 5eac1fb20b..fd48e941e4 100644
--- a/core/src/main/java/hudson/Util.java
+++ b/core/src/main/java/hudson/Util.java
@@ -13,6 +13,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.StringTokenizer;
@@ -345,6 +346,10 @@ public class Util {
 
     public static final SimpleDateFormat XS_DATETIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 
+    // Note: RFC822 dates must not be localized!
+    public static final SimpleDateFormat RFC822_DATETIME_FORMATTER
+            = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US);
+
     static {
         XS_DATETIME_FORMATTER.setTimeZone(new SimpleTimeZone(0,"GMT"));
     }
diff --git a/core/src/main/resources/hudson/rss20.jelly b/core/src/main/resources/hudson/rss20.jelly
index a687ba8acd..27d3067dfc 100644
--- a/core/src/main/resources/hudson/rss20.jelly
+++ b/core/src/main/resources/hudson/rss20.jelly
@@ -15,10 +15,10 @@
           <title>${adapter.getEntryTitle(e)}</title>
           <link>${rootURL}/${adapter.getEntryUrl(e)}</link>
           <guid isPermaLink="false">${adapter.getEntryID(e)}</guid>
-          <pubDate>${h.xsDate(adapter.getEntryTimestamp(e))}</pubDate>
-          <author>Hudson</author>
+          <pubDate>${h.rfc822Date(adapter.getEntryTimestamp(e))}</pubDate>
+          <author>users@hudson.dev.java.net (Hudson Server)</author>
         </item>
       </j:forEach>
     </channel>
   </rss>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
-- 
GitLab