Merge branch 'master' of github.com:AFNetworking/AFNetworking

Author: mattt

.gitignore

@@ -17,4 +17,5 @@ profile
 DerivedData
 .idea/
 Tests/Pods
+Tests/Podfile.lock
 Tests/AFNetworking Tests.xcodeproj/xcshareddata/xcschemes/

AFNetworking/AFURLConnectionOperation.m

@@ -528,6 +528,11 @@ - (void)operationDidStart {
     });
 
     if ([self isCancelled]) {
+        NSDictionary *userInfo = nil;
+        if ([self.request URL]) {
+            userInfo = [NSDictionary dictionaryWithObject:[self.request URL] forKey:NSURLErrorFailingURLErrorKey];
+        }
+        self.error = [NSError errorWithDomain:NSURLErrorDomain code:NSURLErrorCancelled userInfo:userInfo];
         [self finish];
     }
 }

Tests/AFHTTPRequestOperationTests.m

@@ -76,6 +76,8 @@ - (void)testThatCancellationOfRequestOperationSetsError {
 }
 
 - (void)testThatCancellationOfRequestOperationInvokesFailureCompletionBlock {
+    [Expecta setAsynchronousTestTimeout:10.0];
+
     __block NSError *blockError = nil;
 
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"/delay/5" relativeToURL:self.baseURL]];