Differences From Artifact [bf3f67d78a]:
- File
src/OFHTTPClient.m
— part of check-in
[13ee56edf3]
at
2014-06-21 21:43:43
on branch trunk
— Move all macros from OFObject.h to macros.h
This means that OFObject.h imports macros.h now, making it unnecessary
to manually import macros.h in almost every file. And while at it, also
import autorelease.h in OFObject.h, so that this doesn't need to be
manually imported in almost every file as well. (user: js, size: 15180) [annotate] [blame] [check-ins using]
To Artifact [38cf4b12f6]:
- File src/OFHTTPClient.m — part of check-in [29f7a25643] at 2014-07-05 08:32:58 on branch trunk — OFHTTPClient: Add support for Basic Authorization (user: js, size: 15694) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
319 320 321 322 323 324 325 326 327 328 329 330 331 332 |
redirects: (size_t)redirects
{
void *pool = objc_autoreleasePoolPush();
OFURL *URL = [request URL];
OFString *scheme = [URL scheme];
of_http_request_method_t method = [request method];
OFMutableString *requestString;
OFDictionary *headers = [request headers];
OFDataArray *entity = [request entity];
OFTCPSocket *socket;
OFHTTPClientResponse *response;
OFString *line, *path, *version, *redirect, *keepAlive;
OFMutableDictionary *serverHeaders;
OFEnumerator *keyEnumerator, *objectEnumerator;
| > | 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 |
redirects: (size_t)redirects
{
void *pool = objc_autoreleasePoolPush();
OFURL *URL = [request URL];
OFString *scheme = [URL scheme];
of_http_request_method_t method = [request method];
OFMutableString *requestString;
OFString *user, *password;
OFDictionary *headers = [request headers];
OFDataArray *entity = [request entity];
OFTCPSocket *socket;
OFHTTPClientResponse *response;
OFString *line, *path, *version, *redirect, *keepAlive;
OFMutableDictionary *serverHeaders;
OFEnumerator *keyEnumerator, *objectEnumerator;
|
| ︙ | ︙ | |||
384 385 386 387 388 389 390 391 392 393 394 395 396 397 | [request protocolVersionString]]; if ([URL port] == 80) [requestString appendFormat: @"Host: %@\r\n", [URL host]]; else [requestString appendFormat: @"Host: %@:%d\r\n", [URL host], [URL port]]; if ([headers objectForKey: @"User-Agent"] == nil) [requestString appendString: @"User-Agent: Something using ObjFW " @"<https://webkeks.org/objfw>\r\n"]; keyEnumerator = [headers keyEnumerator]; | > > > > > > > > > > > > > > > > > | 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 |
[request protocolVersionString]];
if ([URL port] == 80)
[requestString appendFormat: @"Host: %@\r\n", [URL host]];
else
[requestString appendFormat: @"Host: %@:%d\r\n", [URL host],
[URL port]];
user = [URL user];
password = [URL password];
if ([user length] > 0 || [password length] > 0) {
OFDataArray *authorization = [OFDataArray dataArray];
[authorization addItems: [user UTF8String]
count: [user UTF8StringLength]];
[authorization addItem: ":"];
[authorization addItems: [password UTF8String]
count: [password UTF8StringLength]];
[requestString appendFormat:
@"Authorization: Basic %@\r\n",
[authorization stringByBase64Encoding]];
}
if ([headers objectForKey: @"User-Agent"] == nil)
[requestString appendString:
@"User-Agent: Something using ObjFW "
@"<https://webkeks.org/objfw>\r\n"];
keyEnumerator = [headers keyEnumerator];
|
| ︙ | ︙ |