Merge branch 'v2.x-beta' into ck2openpanel

karelia · Jul 8, 2013 · 3ed50f7 · 3ed50f7
2 parents 83664da + 195b7f6
commit 3ed50f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ConnectionKit/CK2FileOperation.m b/ConnectionKit/CK2FileOperation.m
@@ -263,6 +263,9 @@ - (void)completeWithError:(NSError *)error;
 
         if (_completionBlock)   // only allow "completion" to happen the once!
         {
+            // It's now safe to stop the protocol as it can't misinterpret the message and issue its own cancellation error (or at least if it does, goes ignored)
+            [_protocol stop];
+
             _completionBlock(error);
             [_completionBlock release]; _completionBlock = nil;
 
@@ -315,8 +318,6 @@ - (void)cancel;
     NSError *cancellationError = [[NSError alloc] initWithDomain:NSURLErrorDomain code:NSURLErrorCancelled userInfo:nil];
     [self completeWithError:cancellationError];
 
-    // Once the cancellation message is queued up, it's safe to tell the protocol as it can't misinterpret the message and issue its own cancellation error
-    [_protocol stop];
     [cancellationError release];
 }
 

diff --git a/ConnectionKit/CK2WebDAVProtocol.m b/ConnectionKit/CK2WebDAVProtocol.m
@@ -102,7 +102,7 @@ - (id)initForEnumeratingDirectoryWithRequest:(NSURLRequest *)request includingPr
                 if (!((mask & NSDirectoryEnumerationSkipsHiddenFiles) && [name hasPrefix:@"."]))
                 {
 
-                    NSURL* url = [davRequest concatenatedURLWithPath:[item href]];
+                    NSURL* url = [[davRequest concatenatedURLWithPath:[item href]] absoluteURL];
                     [CK2FileManager setTemporaryResourceValue:[item modificationDate] forKey:NSURLContentModificationDateKey inURL:url];
                     [CK2FileManager setTemporaryResourceValue:[item creationDate] forKey:NSURLCreationDateKey inURL:url];
                     [CK2FileManager setTemporaryResourceValue:@(item.contentLength) forKey:NSURLFileSizeKey inURL:url];