From c8cc83bf0033b569d80aa43249541f670150aa6c Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Fri, 3 Oct 2008 07:47:18 +0000
Subject: [PATCH] backport fix from base

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/stable@26899 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                 | 6 ++++++
 Source/Additions/GSMime.m | 5 ++++-
 Source/GSHTTPURLHandle.m  | 5 +++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5497b3d49..2cafa61e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-03  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSHTTPURLHandle.m:
+	* Source/Additions/GSMime.m:
+	Improve handling of completion of parse of http response.
+
 2008-10-01  Adam Fedor  <fedor@gnu.org>
 
 	* Source/DocMakefile: Add NSAffineTranform
diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index ddaa6f2df..76ebb6836 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -1406,7 +1406,10 @@ wordData(NSString *word)
 	      return [self parse: d];
 	    }
 	}
-
+      if (flags.complete == 1)
+	{
+	  return NO;
+	}
       return YES;	/* Want more data for body */
     }
   else
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 15c12111c..f585e0ada 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -548,7 +548,6 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
   NSData		*d;
   NSRange		r;
   unsigned		readCount;
-  BOOL			complete = NO;
 
   RETAIN(self);
 
@@ -574,7 +573,7 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
       [sock closeFile];
       DESTROY(sock);
     }
-  else if ([parser parse: d] == NO && (complete = [parser isComplete]) == NO)
+  else if ([parser parse: d] == NO && [parser isComplete] == NO)
     {
       if (debug == YES)
 	{
@@ -585,6 +584,8 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
     }
   else
     {
+      BOOL	complete = [parser isComplete];
+
       if (complete == NO && [parser isInHeaders] == NO)
 	{
 	  GSMimeHeader	*info;