don't report intentionally cancelled HTTP requests as error on os x + ios

2 files changed, 12 insertions, 0 deletions

diff --git a/ios/MBXViewController.mm b/ios/MBXViewController.mm
index f2ed117d46..3e52db752d 100644
--- a/ios/MBXViewController.mm
+++ b/ios/MBXViewController.mm
@@ -479,6 +479,11 @@ namespace llmr
             {
                 dispatch_async(queue, ^(){
                     [[NSNotificationCenter defaultCenter] postNotificationName:MBXUpdateActivityNotification object:nil];
+                    if ([error code] == NSURLErrorCancelled) {
+                        // We intentionally cancelled this request. Do nothing.
+                        return;
+                    }
+
                     Response res;
 
                     if ( ! error && [response isKindOfClass:[NSHTTPURLResponse class]])
diff --git a/macosx/main.mm b/macosx/main.mm
index 705bff8ff5..269d2bc6ed 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -48,12 +48,19 @@ Request *request_http(std::string url, std::function<void(Response&)> background
 {
     NSURLSessionDataTask *task = [[NSURLSession sharedSession] dataTaskWithURL:[NSURL URLWithString:@(url.c_str())] completionHandler:^(NSData *data, NSURLResponse *response, NSError *error)
     {
+        if ([error code] == NSURLErrorCancelled) {
+            // We intentionally cancelled this request. Do nothing.
+            return;
+        }
+
         Response res;
 
         if ( ! error && [response isKindOfClass:[NSHTTPURLResponse class]])
         {
             res.code = [(NSHTTPURLResponse *)response statusCode];
             res.body = { (const char *)[data bytes], [data length] };
+        } else {
+            NSLog(@"http error (%s): %@", url.c_str(), [error localizedDescription]);
         }
 
         background_function(res);