GCDAsyncSocket: fixed bug: socket was closed with nil error if SecureTransport is unavaliable.

dvor · dvor · commit 1ee2e65e6ed7 · 2013-12-20T02:25:05.000+02:00
In case if IS_SECURE_TRANSPORT_AVAILABLE == NO, in 'doReadEOF' method code for creating
connectionClosedError wasn't called.
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -4973,23 +4973,25 @@ - (void)doReadEOF
 	{
 		if (error == nil)
 		{
-			if ([self usingSecureTransportForTLS])
-			{
-				#if SECURE_TRANSPORT_MAYBE_AVAILABLE
-				if (sslErrCode != noErr && sslErrCode != errSSLClosedGraceful)
+			#if SECURE_TRANSPORT_MAYBE_AVAILABLE
+				if ([self usingSecureTransportForTLS])
 				{
-					error = [self sslError:sslErrCode];
+					if (sslErrCode != noErr && sslErrCode != errSSLClosedGraceful)
+					{
+						error = [self sslError:sslErrCode];
+					}
+					else
+					{
+						error = [self connectionClosedError];
+					}
 				}
 				else
 				{
 					error = [self connectionClosedError];
 				}
-				#endif
-			}
-			else
-			{
-				error = [self connectionClosedError];
-			}
+			#else
+					error = [self connectionClosedError];
+			#endif
 		}
 		[self closeWithError:error];
 	}

Original file line number	Diff line number	Diff line change
`@@ -4973,23 +4973,25 @@ - (void)doReadEOF`
`4973`	`4973`	`{`
`4974`	`4974`	`if (error == nil)`
`4975`	`4975`	`{`
`4976`		`- if ([self usingSecureTransportForTLS])`
`4977`		`- {`
`4978`		`- #if SECURE_TRANSPORT_MAYBE_AVAILABLE`
`4979`		`- if (sslErrCode != noErr && sslErrCode != errSSLClosedGraceful)`
	`4976`	`+ #if SECURE_TRANSPORT_MAYBE_AVAILABLE`
	`4977`	`+ if ([self usingSecureTransportForTLS])`
`4980`	`4978`	`{`
`4981`		`- error = [self sslError:sslErrCode];`
	`4979`	`+ if (sslErrCode != noErr && sslErrCode != errSSLClosedGraceful)`
	`4980`	`+ {`
	`4981`	`+ error = [self sslError:sslErrCode];`
	`4982`	`+ }`
	`4983`	`+ else`
	`4984`	`+ {`
	`4985`	`+ error = [self connectionClosedError];`
	`4986`	`+ }`
`4982`	`4987`	`}`
`4983`	`4988`	`else`
`4984`	`4989`	`{`
`4985`	`4990`	`error = [self connectionClosedError];`
`4986`	`4991`	`}`
`4987`		`- #endif`
`4988`		`- }`
`4989`		`- else`
`4990`		`- {`
`4991`		`- error = [self connectionClosedError];`
`4992`		`- }`
	`4992`	`+ #else`
	`4993`	`+ error = [self connectionClosedError];`
	`4994`	`+ #endif`
`4993`	`4995`	`}`
`4994`	`4996`	`[self closeWithError:error];`
`4995`	`4997`	`}`