Differences From Artifact [9f5abefa32]:
- File src/OFHTTPServer.m — part of check-in [813c00ccf0] at 2013-01-09 22:24:47 on branch trunk — Update copyright. (user: js, size: 14294) [annotate] [blame] [check-ins using]
To Artifact [85b2274e9b]:
- File
src/OFHTTPServer.m
— part of check-in
[8472e9eade]
at
2013-01-14 23:21:36
on branch trunk
— OFHTTPServer: Always send Server and Date.
This also makes sure those aren't sent twice in case they are also in
the headers. (user: js, size: 14288) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
455 456 457 458 459 460 461 462 463 464 465 466 467 468 |
- (void)sendReply
{
OFURL *URL;
OFHTTPRequest *request;
OFHTTPRequestReply *reply;
OFDictionary *replyHeaders;
OFDataArray *replyData;
OFEnumerator *keyEnumerator, *valueEnumerator;
OFString *key, *value;
size_t pos;
[timer invalidate];
[timer release];
timer = nil;
| > | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 |
- (void)sendReply
{
OFURL *URL;
OFHTTPRequest *request;
OFHTTPRequestReply *reply;
OFDictionary *replyHeaders;
OFDataArray *replyData;
OFString *date;
OFEnumerator *keyEnumerator, *valueEnumerator;
OFString *key, *value;
size_t pos;
[timer invalidate];
[timer release];
timer = nil;
|
| ︙ | ︙ | |||
499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 |
[request setHeaders: headers];
[request setPOSTData: POSTData];
[request setRemoteAddress: [sock remoteAddress]];
reply = [[server delegate] server: server
didReceiveRequest: request];
if (reply == nil) {
[self sendErrorAndClose: 500];
@throw [OFInvalidArgumentException
exceptionWithClass: [(id)[server delegate] class]
selector: @selector(server:didReceiveRequest:)];
}
replyHeaders = [reply headers];
replyData = [reply data];
[sock writeFormat: @"HTTP/1.1 %d %s\r\n"
| > > > | > | < < < < < < > | | 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 |
[request setHeaders: headers];
[request setPOSTData: POSTData];
[request setRemoteAddress: [sock remoteAddress]];
reply = [[server delegate] server: server
didReceiveRequest: request];
date = [[OFDate date]
dateStringWithFormat: @"%a, %d %b %Y %H:%M:%S GMT"];
if (reply == nil) {
[self sendErrorAndClose: 500];
@throw [OFInvalidArgumentException
exceptionWithClass: [(id)[server delegate] class]
selector: @selector(server:didReceiveRequest:)];
}
replyHeaders = [reply headers];
replyData = [reply data];
[sock writeFormat: @"HTTP/1.1 %d %s\r\n"
@"Server: %@\r\n"
@"Date: %@\r\n",
[reply statusCode],
status_code_to_string([reply statusCode]),
[server name], date];
if (requestType != OF_HTTP_REQUEST_TYPE_HEAD)
[sock writeFormat: @"Content-Length: %zu\r\n",
[replyData count] * [replyData itemSize]];
keyEnumerator = [replyHeaders keyEnumerator];
valueEnumerator = [replyHeaders objectEnumerator];
while ((key = [keyEnumerator nextObject]) != nil &&
(value = [valueEnumerator nextObject]) != nil)
if (![key isEqual: @"Server"] && ![key isEqual: @"Date"])
[sock writeFormat: @"%@: %@\r\n", key, value];
[sock writeString: @"\r\n"];
if (requestType != OF_HTTP_REQUEST_TYPE_HEAD)
[sock writeBuffer: [replyData items]
length: [replyData count] * [replyData itemSize]];
}
|
| ︙ | ︙ |