Differences From Artifact [3793430199]:
- File src/OFHTTPServer.m — part of check-in [917ce5754c] at 2012-12-22 15:37:19 on branch trunk — Add -[doesNotRecognizeSelector:]. (user: js, size: 13748) [annotate] [blame] [check-ins using]
To Artifact [a3b1ef98c3]:
- File
src/OFHTTPServer.m
— part of check-in
[f8a7660ac7]
at
2012-12-26 19:07:59
on branch trunk
— OFHTTPServer: Correctly put the query in the URL.
Before, it incorrectly was part of the path instead of being in the
query field. (user: js, size: 14059) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 |
OFURL *URL;
OFHTTPRequest *request;
OFHTTPRequestResult *reply;
OFDictionary *replyHeaders;
OFDataArray *replyData;
OFEnumerator *keyEnumerator, *valueEnumerator;
OFString *key, *value;
[timer invalidate];
[timer release];
timer = nil;
if (host == nil || port == 0) {
if (HTTPMinorVersion > 0) {
[self sendErrorAndClose: 400];
return;
}
host = [[server host] retain];
port = [server port];
}
URL = [OFURL URL];
[URL setScheme: @"http"];
[URL setHost: host];
[URL setPort: port];
| > > > > > > > > > > > > | | 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 |
OFURL *URL;
OFHTTPRequest *request;
OFHTTPRequestResult *reply;
OFDictionary *replyHeaders;
OFDataArray *replyData;
OFEnumerator *keyEnumerator, *valueEnumerator;
OFString *key, *value;
size_t pos;
[timer invalidate];
[timer release];
timer = nil;
if (host == nil || port == 0) {
if (HTTPMinorVersion > 0) {
[self sendErrorAndClose: 400];
return;
}
host = [[server host] retain];
port = [server port];
}
URL = [OFURL URL];
[URL setScheme: @"http"];
[URL setHost: host];
[URL setPort: port];
if ((pos = [path rangeOfString: @"?"].location) != OF_NOT_FOUND) {
OFString *path_, *query;
path_ = [path substringWithRange: of_range(0, pos)];
query = [path substringWithRange:
of_range(pos + 1, [path length] - pos - 1)];
[URL setPath: path_];
[URL setQuery: query];
} else
[URL setPath: path];
request = [OFHTTPRequest requestWithURL: URL];
[request setRequestType: requestType];
[request setHeaders: headers];
[request setPOSTData: POSTData];
[request setRemoteAddress: [sock remoteAddress]];
|
| ︙ | ︙ |