Fixing potential blocking bug in GCDAsyncSocket on iOS when using TLS (I believe it only affects iOS 5+.) Special thanks to the XMPPFramework mailing list for helping to identify this problem and find a solution.

robbiehanson · robbiehanson · commit fe662b3bc7e1 · 2011-12-05T11:55:53.000-08:00
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -3859,7 +3859,7 @@ - (void)flushSSLBuffers
 	
 #if TARGET_OS_IPHONE
 	
-	if (flags & kSecureSocketHasBytesAvailable)
+	if ((flags & kSecureSocketHasBytesAvailable) && CFReadStreamHasBytesAvailable(readStream))
 	{
 		LogVerbose(@"%@ - Flushing ssl buffers into partialReadBuffer...", THIS_METHOD);
 		
@@ -4013,7 +4013,10 @@ - (void)doReadData
 			// Relegated to using CFStream... :( Boo! Give us SecureTransport Apple!
 			
 			estimatedBytesAvailable = 0;
-			hasBytesAvailable = (flags & kSecureSocketHasBytesAvailable) ? YES : NO;
+			if ((flags & kSecureSocketHasBytesAvailable) && CFReadStreamHasBytesAvailable(readStream))
+				hasBytesAvailable = YES;
+			else
+				hasBytesAvailable = NO;
 		}
 		else
 		{
diff --git a/GCD/Xcode/SimpleHTTPClient/Mobile/SimpleHTTPClient.xcodeproj/project.pbxproj b/GCD/Xcode/SimpleHTTPClient/Mobile/SimpleHTTPClient.xcodeproj/project.pbxproj
@@ -177,7 +177,7 @@
 		DC80CA2B13C3B43F00D29D06 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0430;
 			};
 			buildConfigurationList = DC80CA2E13C3B43F00D29D06 /* Build configuration list for PBXProject "SimpleHTTPClient" */;
 			compatibilityVersion = "Xcode 3.2";
diff --git a/GCD/Xcode/SimpleHTTPClient/Mobile/SimpleHTTPClient/SimpleHTTPClientAppDelegate.m b/GCD/Xcode/SimpleHTTPClient/Mobile/SimpleHTTPClient/SimpleHTTPClientAppDelegate.m
@@ -67,20 +67,21 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 	// When the asynchronous sockets connects, it will invoke the socket:didConnectToHost:port: delegate method.
 	
 	NSError *error = nil;
+	NSString *host = @"deusty.com";
 	
 #if USE_SECURE_CONNECTION
 	uint16_t port = 443; // HTTPS
 #else
 	uint16_t port = 80;  // HTTP
 #endif
 	
-	if (![asyncSocket connectToHost:@"deusty.com" onPort:port error:&error])
+	if (![asyncSocket connectToHost:host onPort:port error:&error])
 	{
 		DDLogError(@"Unable to connect to due to invalid configuration: %@", error);
 	}
 	else
 	{
-		DDLogVerbose(@"Connecting...");
+		DDLogVerbose(@"Connecting to \"%@\" on port %hu...", host, port);
 	}
 	
 #if USE_SECURE_CONNECTION
@@ -106,6 +107,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 	NSDictionary *options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO]
 	                                                    forKey:(NSString *)kCFStreamSSLValidatesCertificateChain];
 	
+	DDLogVerbose(@"Requesting StartTLS with options:\n%@", options);
+	
 	[asyncSocket startTLS:options];
 	
 #endif
@@ -134,6 +137,8 @@ - (void)socket:(GCDAsyncSocket *)sock didConnectToHost:(NSString *)host port:(UI
 	
 	[asyncSocket writeData:requestData withTimeout:-1.0 tag:0];
 	
+	DDLogVerbose(@"Sending HTTP Request:\n%@", requestStr);
+	
 	// Side Note:
 	// 
 	// The AsyncSocket family supports queued reads and writes.
@@ -204,7 +209,7 @@ - (void)socket:(GCDAsyncSocket *)sock didReadData:(NSData *)data withTag:(long)t
 	
 #else
 	
-	DDLogInfo(@"Full httpResponse: %@", httpResponse);
+	DDLogInfo(@"Full HTTP Response:\n%@", httpResponse);
 	
 #endif
 	

Original file line number	Diff line number	Diff line change
`@@ -3859,7 +3859,7 @@ - (void)flushSSLBuffers`
`3859`	`3859`
`3860`	`3860`	`#if TARGET_OS_IPHONE`
`3861`	`3861`
`3862`		`- if (flags & kSecureSocketHasBytesAvailable)`
	`3862`	`+ if ((flags & kSecureSocketHasBytesAvailable) && CFReadStreamHasBytesAvailable(readStream))`
`3863`	`3863`	`{`
`3864`	`3864`	`LogVerbose(@"%@ - Flushing ssl buffers into partialReadBuffer...", THIS_METHOD);`
`3865`	`3865`
`@@ -4013,7 +4013,10 @@ - (void)doReadData`
`4013`	`4013`	`// Relegated to using CFStream... :( Boo! Give us SecureTransport Apple!`
`4014`	`4014`
`4015`	`4015`	`estimatedBytesAvailable = 0;`
`4016`		`- hasBytesAvailable = (flags & kSecureSocketHasBytesAvailable) ? YES : NO;`
	`4016`	`+ if ((flags & kSecureSocketHasBytesAvailable) && CFReadStreamHasBytesAvailable(readStream))`
	`4017`	`+ hasBytesAvailable = YES;`
	`4018`	`+ else`
	`4019`	`+ hasBytesAvailable = NO;`
`4017`	`4020`	`}`
`4018`	`4021`	`else`
`4019`	`4022`	`{`