Differences From Artifact [fb786804a8]:
- File
utils/ofhttp/OFHTTP.m
— part of check-in
[283aece9e8]
at
2020-02-27 23:53:04
on branch trunk
— ofhttp: Properly reset _length on redirect
Additionally, only use _length for progress. (user: js, size: 28064) [annotate] [blame] [check-ins using] [more...]
To Artifact [39d0dcb133]:
- File
utils/ofhttp/OFHTTP.m
— part of check-in
[9c506fc995]
at
2020-03-22 15:51:59
on branch trunk
— ofhttp: Print the HTTP status code on error
Without this, there would be no indication of the error when using -q. (user: js, size: 28316) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
678 679 680 681 682 683 684 685 |
@"%[prog]: Failed to download <%[url]>!\n"
@" %[error]: %[exception]",
@"prog", [OFApplication programName],
@"url", request.URL.string,
@"error", error,
@"exception", e)];
} else if ([e isKindOfClass: [OFHTTPRequestFailedException class]]) {
[of_stderr writeLine: OF_LOCALIZED(@"download_failed",
| > > > | > | > | 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 |
@"%[prog]: Failed to download <%[url]>!\n"
@" %[error]: %[exception]",
@"prog", [OFApplication programName],
@"url", request.URL.string,
@"error", error,
@"exception", e)];
} else if ([e isKindOfClass: [OFHTTPRequestFailedException class]]) {
short statusCode = [[e response] statusCode];
OFString *codeString = [OFString stringWithFormat: @"%d %@",
statusCode, of_http_status_code_to_string(statusCode)];
[of_stderr writeLine: OF_LOCALIZED(@"download_failed",
@"%[prog]: Failed to download <%[url]>!\n"
@" HTTP status code: %[code]",
@"prog", [OFApplication programName],
@"url", request.URL.string,
@"code", codeString)];
} else
@throw e;
_errorCode = 1;
[self performSelector: @selector(downloadNextURL)
afterDelay: 0];
}
|
| ︙ | ︙ | |||
709 710 711 712 713 714 715 | if (!_quiet) [of_stdout writeString: @"\n Error!\n"]; URL = [_URLs objectAtIndex: _URLIndex - 1]; [of_stderr writeLine: OF_LOCALIZED( @"download_failed_exception", | | > | 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 | if (!_quiet) [of_stdout writeString: @"\n Error!\n"]; URL = [_URLs objectAtIndex: _URLIndex - 1]; [of_stderr writeLine: OF_LOCALIZED( @"download_failed_exception", @"%[prog]: Failed to download <%[url]>!\n" @" %[exception]", @"prog", [OFApplication programName], @"url", URL, @"exception", exception)]; _errorCode = 1; [self performSelector: @selector(downloadNextURL) afterDelay: 0]; |
| ︙ | ︙ |