Differences From Artifact [e2bb21d82f]:
- File utils/ofhttp/OFHTTP.m — part of check-in [b16fc262c0] at 2018-04-23 22:19:10 on branch trunk — Use more native AmigaOS APIs on AmigaOS 3 (user: js, size: 26796) [annotate] [blame] [check-ins using]
To Artifact [075e25cbdb]:
- File
utils/ofhttp/OFHTTP.m
— part of check-in
[ba6cb57178]
at
2018-07-03 23:35:08
on branch trunk
— ofhttp: Move around the _URLIndex--
This is to make sure that the same URL is only tried again after we
successfully detected the file name, as otherwise we'd end up in an
infinite loop if we fail to detect the file name. (user: js, size: 26796) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
802 803 804 805 806 807 808 809 810 811 812 813 814 815 |
context: (id)context
{
if ([context isEqual: @"detectFileName"]) {
_currentFileName = [fileNameFromContentDisposition(
[[response headers] objectForKey: @"Content-Disposition"])
copy];
_detectedFileName = true;
[self performSelector: @selector(downloadNextURL)
afterDelay: 0];
return;
}
if ([_outputPath isEqual: @"-"])
| > > > | 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 |
context: (id)context
{
if ([context isEqual: @"detectFileName"]) {
_currentFileName = [fileNameFromContentDisposition(
[[response headers] objectForKey: @"Content-Disposition"])
copy];
_detectedFileName = true;
/* Handle this URL on the next -[downloadNextURL] call */
_URLIndex--;
[self performSelector: @selector(downloadNextURL)
afterDelay: 0];
return;
}
if ([_outputPath isEqual: @"-"])
|
| ︙ | ︙ | |||
914 915 916 917 918 919 920 |
_errorCode = 1;
goto next;
}
clientHeaders = [[_clientHeaders mutableCopy] autorelease];
if (_detectFileName && !_detectedFileName) {
| < < < | 917 918 919 920 921 922 923 924 925 926 927 928 929 930 |
_errorCode = 1;
goto next;
}
clientHeaders = [[_clientHeaders mutableCopy] autorelease];
if (_detectFileName && !_detectedFileName) {
if (!_quiet)
[of_stdout writeFormat: @"⠒ %@", [URL string]];
request = [OFHTTPRequest requestWithURL: URL];
[request setHeaders: clientHeaders];
[request setMethod: OF_HTTP_REQUEST_METHOD_HEAD];
|
| ︙ | ︙ |