Fixes bug where GCDAsyncSocket may stop reading. Fixes issue robbiehanson#30 and issue robbiehanson#34

robbiehanson · robbiehanson · commit 68bd786a9b08 · 2012-03-23T11:59:23.000-07:00
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -4157,10 +4157,8 @@ - (void)doReadData
 		return;
 	}
 	
-	BOOL done        = NO;                                      // Completed read operation
-	BOOL waiting     = NO;                                      // Ran out of data, waiting for more
-	BOOL socketEOF   = (flags & kSocketHasReadEOF) ? YES : NO;  // Nothing more to via socket (end of file)
-	NSError *error   = nil;                                     // Error occured
+	BOOL done        = NO;  // Completed read operation
+	NSError *error   = nil; // Error occured
 	
 	NSUInteger totalBytesReadForCurrentRead = 0;
 	
@@ -4257,7 +4255,10 @@ - (void)doReadData
 	// STEP 2 - READ FROM SOCKET
 	// 
 	
-	if (!done && !waiting && !socketEOF && !error && hasBytesAvailable)
+	BOOL socketEOF = (flags & kSocketHasReadEOF) ? YES : NO;  // Nothing more to via socket (end of file)
+	BOOL waiting   = !done && !error && !socketEOF && !hasBytesAvailable; // Ran out of data, waiting for more
+	
+	if (!done && !error && !socketEOF && !waiting && hasBytesAvailable)
 	{
 		NSAssert((partialReadBufferLength == 0), @"Invalid logic");
 		
@@ -4600,7 +4601,7 @@ - (void)doReadData
 			
 		} // if (bytesRead > 0)
 		
-	} // if (!done && !error && hasBytesAvailable)
+	} // if (!done && !error && !socketEOF && !waiting && hasBytesAvailable)
 	
 	
 	if (!done && currentRead->readLength == 0 && currentRead->term == nil)
@@ -4612,16 +4613,7 @@ - (void)doReadData
 		done = (totalBytesReadForCurrentRead > 0);
 	}
 	
-	// Only one of the following can possibly be true:
-	// 
-	// - waiting
-	// - socketEOF
-	// - socketError
-	// - maxoutError
-	// 
-	// They may all be false.
-	// One of the above may be true even if done is true.
-	// This might be the case if we completed read type #1 via data from the prebuffer.
+	// Check to see if we're done, or if we've made progress
 	
 	if (done)
 	{
diff --git a/GCD/Xcode/ConnectTest/Desktop/ConnectTest/ConnectTestAppDelegate.m b/GCD/Xcode/ConnectTest/Desktop/ConnectTest/ConnectTestAppDelegate.m
@@ -51,7 +51,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 	}
 	#else
 	{
-		NSString *host = @"deusty.com";
+		NSString *host = @"google.com";
 		uint16_t port = 80;
 	
 		

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification`
`51`	`51`	`}`
`52`	`52`	`#else`
`53`	`53`	`{`
`54`		`- NSString *host = @"deusty.com";`
	`54`	`+ NSString *host = @"google.com";`
`55`	`55`	`uint16_t port = 80;`
`56`	`56`
`57`	`57`