Differences From Artifact [fa59054e17]:
- File
src/OFHTTPClient.m
— part of check-in
[3d16a30f41]
at
2013-06-22 12:12:36
on branch trunk
— Rework exceptions.
This mostly removes the argument for the class in which the exception
occurred. As backtraces were recently added for all platforms, the
passed class does not give any extra information on where the exception
occurred anymore.This also removes a few other arguments which were not too helpful. In
the past, the idea was to pass as many arguments as possible so that it
is easier to find the origin of the exception. However, as backtraces
are a much better way to find the origin, those are not useful anymore
and just make the exception more cumbersome to use. The rule is now to
only pass arguments that might help in recovering from the exception or
provide information that is otherwise not easily accessible. (user: js, size: 14753) [annotate] [blame] [check-ins using]
To Artifact [79a0572733]:
- File src/OFHTTPClient.m — part of check-in [e0182a3e55] at 2013-06-28 18:48:14 on branch trunk — OFHTTPClient: Only retry on ECONNRESET or EPIPE. (user: js, size: 14569) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
124 125 126 127 128 129 130 |
length: (size_t)length
{
if (_atEndOfStream) {
OFReadFailedException *e;
e = [OFReadFailedException exceptionWithStream: self
requestedLength: length];
| < < < < < < | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 |
length: (size_t)length
{
if (_atEndOfStream) {
OFReadFailedException *e;
e = [OFReadFailedException exceptionWithStream: self
requestedLength: length];
e->_errNo = ENOTCONN;
@throw e;
}
if (!_hasContentLength && !_chunked)
return [_socket readIntoBuffer: buffer
length: length];
|
| ︙ | ︙ | |||
433 434 435 436 437 438 439 |
[requestString appendString: @"Connection: keep-alive\r\n"];
[requestString appendString: @"\r\n"];
@try {
[socket writeString: requestString];
} @catch (OFWriteFailedException *e) {
| | | | < | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 |
[requestString appendString: @"Connection: keep-alive\r\n"];
[requestString appendString: @"\r\n"];
@try {
[socket writeString: requestString];
} @catch (OFWriteFailedException *e) {
if ([e errNo] != ECONNRESET && [e errNo] != EPIPE)
@throw e;
/* Reconnect in case a keep-alive connection timed out */
socket = [self OF_createSocketForRequest: request];
[socket writeString: requestString];
}
if (requestType == OF_HTTP_REQUEST_TYPE_POST)
[socket writeBuffer: [POSTData items]
|
| ︙ | ︙ |