Patch to fix a problem when using didReceiveData: delegate or dataReceivedBlock callback

Classes/ASIHTTPRequest.h

@@ -264,6 +264,9 @@ typedef void (^ASIDataBlock)(NSData *data);
 	// Description of the HTTP status code
 	NSString *responseStatusMessage;
 
+    // HTTP version of the response
+    NSString *responseVersion;
+
 	// Size of the response
 	unsigned long long contentLength;
 
@@ -944,6 +947,7 @@ typedef void (^ASIDataBlock)(NSData *data);
 @property (retain) NSDictionary *proxyCredentials;
 @property (assign,readonly) int responseStatusCode;
 @property (retain,readonly) NSString *responseStatusMessage;
+@property (retain,readonly) NSString *responseVersion;
 @property (retain) NSMutableData *rawResponseData;
 @property (assign) NSTimeInterval timeOutSeconds;
 @property (retain, nonatomic) NSString *requestMethod;

Classes/ASIHTTPRequest.m

@@ -225,6 +225,7 @@ - (void)callBlock:(ASIBasicBlock)block;
 @property (retain) NSString *authenticationRealm;
 @property (retain) NSString *proxyAuthenticationRealm;
 @property (retain) NSString *responseStatusMessage;
+@property (retain) NSString *responseVersion;
 @property (assign) BOOL inProgress;
 @property (assign) int retryCount;
 @property (assign) BOOL willRetryRequest;
@@ -389,6 +390,7 @@ - (void)dealloc
 	[PACurl release];
 	[clientCertificates release];
 	[responseStatusMessage release];
+	[responseVersion release];
 	[connectionInfo release];
 	[requestID release];
 	[dataDecompressor release];
@@ -2155,6 +2157,7 @@ - (void)readResponseHeaders
 	[self setResponseHeaders:[NSMakeCollectable(CFHTTPMessageCopyAllHeaderFields(message)) autorelease]];
 	[self setResponseStatusCode:(int)CFHTTPMessageGetResponseStatusCode(message)];
 	[self setResponseStatusMessage:[NSMakeCollectable(CFHTTPMessageCopyResponseStatusLine(message)) autorelease]];
+    [self setResponseVersion:[NSMakeCollectable(CFHTTPMessageCopyVersion(message)) autorelease]];
 
 	if ([self downloadCache] && ([[self downloadCache] canUseCachedDataForRequest:self])) {
 
@@ -2258,10 +2261,8 @@ - (void)readResponseHeaders
 
 		NSString *connectionHeader = [[[self responseHeaders] objectForKey:@"Connection"] lowercaseString];
 
-		NSString *httpVersion = [NSMakeCollectable(CFHTTPMessageCopyVersion(message)) autorelease];
-
 		// Don't re-use the connection if the server is HTTP 1.0 and didn't send Connection: Keep-Alive
-		if (![httpVersion isEqualToString:(NSString *)kCFHTTPVersion1_0] || [connectionHeader isEqualToString:@"keep-alive"]) {
+		if (![self.responseVersion isEqualToString:(NSString *)kCFHTTPVersion1_0] || [connectionHeader isEqualToString:@"keep-alive"]) {
 
 			// See if server explicitly told us to close the connection
 			if (![connectionHeader isEqualToString:@"close"]) {
@@ -3331,6 +3332,12 @@ - (void)handleBytesAvailable
 			dataWillBeHandledExternally = YES;
 		}
 		#endif
+
+		if ([self authenticationNeeded]) {
+			// Don't pass the body of a 401/407 response to the callback.
+			dataWillBeHandledExternally = NO;
+		}
+
 		// Does the delegate want to handle the data manually?
 		if (dataWillBeHandledExternally) {
 
@@ -5086,6 +5093,7 @@ - (void)setRequestRedirectedBlock:(ASIBasicBlock)aRedirectBlock
 @synthesize shouldPresentProxyAuthenticationDialog;
 @synthesize authenticationNeeded;
 @synthesize responseStatusMessage;
+@synthesize responseVersion;
 @synthesize shouldPresentCredentialsBeforeChallenge;
 @synthesize haveBuiltRequestHeaders;
 @synthesize inProgress;