fixed OGo issue #1282, \r\n handling

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

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index e5f06fa4a2df10cb173e564804db28b741c47136..ded5fc96390b63dcf6e8b940e59b13466ba64d84 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-05  Helge Hess  <helge.hess@opengroupware.org>
 
+       * NGMime: fixed an issue with incorrect header field termination
+         (v4.5.217)
+
        * NGImap4: fixed a MacOSX incompatibility (v4.5.216)
 
 2005-03-03  Helge Hess  <helge.hess@opengroupware.org>

diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog
index fbba16db4faa4a83135ded58c6a3ec27f3828a97..7f0e2c619a6ec520e2a7ddb2441b1ded4b9a6203 100644 (file)
--- a/sope-mime/NGMime/ChangeLog
+++ b/sope-mime/NGMime/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-05  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGMimePartGenerator.m: properly terminate header fields with \r\n
+         (OGo bug #1282)
+
 2005-01-30  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGMimeContentTypeHeaderFieldGenerator.m, NGPart.m: fixed default

diff --git a/sope-mime/NGMime/NGMimePartGenerator.m b/sope-mime/NGMime/NGMimePartGenerator.m
index d3793f6c0c97638775f391ff46339a9602905973..0e915e7ebd7d8d09c78b24dbdd5ad6583a51bea5 100644 (file)
--- a/sope-mime/NGMime/NGMimePartGenerator.m
+++ b/sope-mime/NGMime/NGMimePartGenerator.m
@@ -19,12 +19,12 @@
   02111-1307, USA.
 */
 
-#import "NGMimePartGenerator.h"
-#import "NGMimeHeaderFieldGenerator.h"
-#import "NGMimeBodyGenerator.h"
-#import "NGMimeJoinedData.h"
-#import <NGMime/NGMimeType.h>
-#import "common.h"
+#include "NGMimePartGenerator.h"
+#include "NGMimeHeaderFieldGenerator.h"
+#include "NGMimeBodyGenerator.h"
+#include "NGMimeJoinedData.h"
+#include <NGMime/NGMimeType.h>
+#include "common.h"
 
 @implementation NGMimePartGenerator
 
@@ -144,7 +144,7 @@ static BOOL debugOn = NO;
   id            value  = nil;
   const char    *bytes = NULL;
   unsigned      len    = 0;
-
+  
   res = [NSMutableData dataWithCapacity:64];
   bytes = [_headerField cString];
   len   = [_headerField length];
@@ -154,13 +154,13 @@ static BOOL debugOn = NO;
     bytes++;
     len--;
   }
-  while ((value = [_values nextObject])) {
+  while ((value = [_values nextObject]) != nil) {
     data = [self generateDataForHeaderField:(NSString *)_headerField
                  value:value];
     [res appendBytes:bytes length:len];
     [res appendBytes:": " length:2];
     [res appendData:data];
-    [res appendBytes:"\n" length:1];
+    [res appendBytes:"\r\n" length:2];
   }
   return res;
 }

diff --git a/sope-mime/Version b/sope-mime/Version
index 126abde2d98c9fb0ee68523ac74db2c52974f47c..981f7bf8bd9684a0f21cfe58289a61daa3dc1154 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=216
+SUBMINOR_VERSION:=217
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34