gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

NSURLSession: Call completion handler on failed request

Browse source
This commit is contained in:
hmelder 2024-05-07 11:04:42 +02:00 committed by Hugo Melder
parent 6011b3c528
commit f6eaa5bd03
1 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Source/NSURLSession.m
View file

@ -585,12 +585,16 @@ static unsigned nextSessionIdentifier()
NSURLSession *session;
NSOperationQueue *delegateQueue;
id<NSURLSessionDelegate> delegate;
void (^dataCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error);
void (^downloadCompletionHandler)(NSURL *location, NSURLResponse *response, NSError *error);
session = [task session];
NSAssert(nil != session, @"Missing session");
delegateQueue = [session delegateQueue];
delegate = [session delegate];
dataCompletionHandler = [task dataCompletionHandler];
downloadCompletionHandler = [task downloadCompletionHandler];
if (nil != delegate)
{
@ -616,6 +620,44 @@ static unsigned nextSessionIdentifier()
});
}];
}
else if (nil != dataCompletionHandler)
{
[delegateQueue addOperationWithBlock:
^{
if (NSURLSessionTaskStateCompleted == [task state])
{
return;
}
dataCompletionHandler(nil, nil, error);
[task setState: NSURLSessionTaskStateCompleted];
dispatch_async([session workQueue],
^{
[session removeTask: task];
});
}];
}
else if (nil != downloadCompletionHandler)
{
[delegateQueue addOperationWithBlock:
^{
if (NSURLSessionTaskStateCompleted == [task state])
{
return;
}
downloadCompletionHandler(nil, nil, error);
[task setState: NSURLSessionTaskStateCompleted];
dispatch_async([session workQueue],
^{
[session removeTask: task];
});
}];
}
else
{
if (NSURLSessionTaskStateCompleted == [task state])
@ -836,9 +878,7 @@ static unsigned nextSessionIdentifier()
RELEASE(cacheable);
}
if (nil != dataCompletionHandler
&& ([task isKindOfClass: [NSURLSessionDataTask class]]
|| [task isKindOfClass: [NSURLSessionUploadTask class]]))
if (nil != dataCompletionHandler)
{
NSData *data = [NSURLProtocol propertyForKey: @"tempData"
inRequest: [protocol request]];
@ -860,8 +900,7 @@ static unsigned nextSessionIdentifier()
});
}];
}
else if (nil != downloadCompletionHandler
&& [task isKindOfClass: [NSURLSessionDownloadTask class]])
else if (nil != downloadCompletionHandler)
{
NSURL *fileURL = [NSURLProtocol propertyForKey: @"tempFileURL"
inRequest: [protocol request]];