Move the invalidateTimeoutTimer call in RKResponse from didReceiveData to didReceiveResponse and didFailWithError so we are sure its always called and as early as possible.

Brian Morton · blakewatters · commit 15d05f14938a · 2012-01-20T09:15:35.000-05:00
diff --git a/Code/Network/RKResponse.m b/Code/Network/RKResponse.m
@@ -189,6 +189,7 @@ - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLRe
     RKLogDebug(@"NSHTTPURLResponse Status Code: %ld", (long) [response statusCode]);
     RKLogDebug(@"Headers: %@", [response allHeaderFields]);
 	_httpURLResponse = [response retain];
+    [_request invalidateTimeoutTimer];
 }
 
 - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
@@ -199,6 +200,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
 	_failureError = [error retain];
 	[_request didFailLoadWithError:_failureError];
+    [_request invalidateTimeoutTimer];
 }
 
 - (NSInputStream *)connection:(NSURLConnection *)connection needNewBodyStream:(NSURLRequest *)request {

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSHTTPURLRe`
`189`	`189`	`RKLogDebug(@"NSHTTPURLResponse Status Code: %ld", (long) [response statusCode]);`
`190`	`190`	`RKLogDebug(@"Headers: %@", [response allHeaderFields]);`
`191`	`191`	`_httpURLResponse = [response retain];`
	`192`	`+ [_request invalidateTimeoutTimer];`
`192`	`193`	`}`
`193`	`194`
`194`	`195`	`- (void)connectionDidFinishLoading:(NSURLConnection *)connection {`
`@@ -199,6 +200,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection {`
`199`	`200`	`- (void)connection:(NSURLConnection )connection didFailWithError:(NSError )error {`
`200`	`201`	`_failureError = [error retain];`
`201`	`202`	`[_request didFailLoadWithError:_failureError];`
	`203`	`+ [_request invalidateTimeoutTimer];`
`202`	`204`	`}`
`203`	`205`
`204`	`206`	`- (NSInputStream )connection:(NSURLConnection )connection needNewBodyStream:(NSURLRequest *)request {`