fixed an issue with future date headers and libFoundation

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@430 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 35a55a53d1e3915253b8d43d044defe57ef9e0e9..8f6174e4c0dcd2a0108a153f29f3398dbff8b16b 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-09  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGMime: fixed an issue with future date headers and libFoundation
+         (v4.5.204)
+
 2004-12-03  Helge Hess  <helge.hess@skyrix.com>
 
        * NGImap4: fixed an error handler in the Sieve client (v4.5.203)

diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog
index fb4b383c8426a0db19cc40c7f03fd31e569dbf13..5cb01ac953c7bec22963c35d04c1ed46a7f772c7 100644 (file)
--- a/sope-mime/NGMime/ChangeLog
+++ b/sope-mime/NGMime/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-09  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGMimeRFC822DateHeaderFieldParser.m: fix spam mail date header
+         parsing for libFoundation
+
 2004-11-13  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGConcreteMimeType.m: added support for 'reply-type' parameter in

diff --git a/sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m b/sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
index f4523d03384201246672e332b6af709b9096c810..291a7269f31636b364cbfbcf600fd21ef9772a56 100644 (file)
--- a/sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
+++ b/sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
@@ -362,6 +362,14 @@ static NSTimeZone *parseTimeZone(unsigned char *s, unsigned int len) {
   else if (year >= 0 && year < 70) // Y2K
     year += 2000;
   
+#if LIB_FOUNDATION_LIBRARY
+  if (year > 2030) {
+    NSLog(@"ERROR(%s): got invalid year in date header %d: '%s'",
+         __PRETTY_FUNCTION__, year, buf);
+    year = 2000; /* no choice is good ..., maybe return nil? */
+  }
+#endif
+  
   /* parse hour */
   
   while (!isdigit(*bytes)) { /* go to first digit */

diff --git a/sope-mime/Version b/sope-mime/Version
index 1b20d9637cf40378234ba6f26802342563b4d2fa..cef3b420af657e395ce6c78a280c0063b0f15855 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,6 +2,6 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=203
+SUBMINOR_VERSION:=204
 
 # v4.2.149 requires libNGStreams v4.2.34