Ben Copsey

Merge branch 'master' into concurrent

@@ -234,13 +234,13 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount; @@ -234,13 +234,13 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount;
234 // This lock prevents the operation from being cancelled at an inopportune moment 234 // This lock prevents the operation from being cancelled at an inopportune moment
235 NSRecursiveLock *cancelledLock; 235 NSRecursiveLock *cancelledLock;
236 236
237 - // Called on the delegate when the request starts 237 + // Called on the delegate (if implemented) when the request starts. Default is requestStarted:
238 SEL didStartSelector; 238 SEL didStartSelector;
239 239
240 - // Called on the delegate when the request completes successfully 240 + // Called on the delegate (if implemented) when the request completes successfully. Default is requestFinished:
241 SEL didFinishSelector; 241 SEL didFinishSelector;
242 242
243 - // Called on the delegate when the request fails 243 + // Called on the delegate (if implemented) when the request fails. Default is requestFailed:
244 SEL didFailSelector; 244 SEL didFailSelector;
245 245
246 // Used for recording when something last happened during the request, we will compare this value with the current date to time out requests when appropriate 246 // Used for recording when something last happened during the request, we will compare this value with the current date to time out requests when appropriate
@@ -406,13 +406,13 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount; @@ -406,13 +406,13 @@ extern unsigned long const ASIWWANBandwidthThrottleAmount;
406 406
407 #pragma mark handling request complete / failure 407 #pragma mark handling request complete / failure
408 408
409 -// Called when a request starts, lets the delegate now via didStartSelector 409 +// Called when a request starts, lets the delegate know via didStartSelector
410 - (void)requestStarted; 410 - (void)requestStarted;
411 411
412 -// Called when a request completes successfully, lets the delegate now via didFinishSelector 412 +// Called when a request completes successfully, lets the delegate know via didFinishSelector
413 - (void)requestFinished; 413 - (void)requestFinished;
414 414
415 -// Called when a request fails, and lets the delegate now via didFailSelector 415 +// Called when a request fails, and lets the delegate know via didFailSelector
416 - (void)failWithError:(NSError *)theError; 416 - (void)failWithError:(NSError *)theError;
417 417
418 #pragma mark parsing HTTP response headers 418 #pragma mark parsing HTTP response headers