Overview
| Comment: | OFHTTP{Client,Server}: Concatenate repeated fields |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
b73d25b8c6fd805dcde28b96a4a6e7d1 |
| User & Date: | js on 2015-11-02 13:53:07 |
| Other Links: | manifest | tags |
Context
|
2015-11-02
| ||
| 15:07 | OFDate: Use wcsftime on Windows check-in: b8fc41bf18 user: js tags: trunk | |
| 13:53 | OFHTTP{Client,Server}: Concatenate repeated fields check-in: b73d25b8c6 user: js tags: trunk | |
|
2015-10-24
| ||
| 20:53 | OFSystemInfo.h: Use OF_X86 rather than OF_X86_ASM check-in: 952af5f0aa user: js tags: trunk | |
Changes
Modified src/OFHTTPClient.m from [10e2ede1ff] to [824a74cbab].
| ︙ | ︙ | |||
501 502 503 504 505 506 507 |
exceptionWithVersion: version];
status = (int)[[line substringWithRange: of_range(9, 3)] decimalValue];
serverHeaders = [OFMutableDictionary dictionary];
for (;;) {
| | | 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 |
exceptionWithVersion: version];
status = (int)[[line substringWithRange: of_range(9, 3)] decimalValue];
serverHeaders = [OFMutableDictionary dictionary];
for (;;) {
OFString *key, *value, *old;
const char *lineC, *tmp;
char *keyC;
@try {
line = [socket readLine];
} @catch (OFInvalidEncodingException *e) {
@throw [OFInvalidServerReplyException exception];
|
| ︙ | ︙ | |||
544 545 546 547 548 549 550 551 552 553 554 555 556 557 |
do {
tmp++;
} while (*tmp == ' ');
value = [OFString stringWithUTF8String: tmp];
[serverHeaders setObject: value
forKey: key];
}
[serverHeaders makeImmutable];
if ([_delegate respondsToSelector:
| > > > > | 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 |
do {
tmp++;
} while (*tmp == ' ');
value = [OFString stringWithUTF8String: tmp];
old = [serverHeaders objectForKey: key];
if (old != nil)
value = [old stringByAppendingFormat: @",%@", value];
[serverHeaders setObject: value
forKey: key];
}
[serverHeaders makeImmutable];
if ([_delegate respondsToSelector:
|
| ︙ | ︙ |
Modified src/OFHTTPServer.m from [0ddfcecf31] to [c9577b3169].
| ︙ | ︙ | |||
449 450 451 452 453 454 455 |
_state = PARSING_HEADERS;
return true;
}
- (bool)parseHeaders: (OFString*)line
{
| | | 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 |
_state = PARSING_HEADERS;
return true;
}
- (bool)parseHeaders: (OFString*)line
{
OFString *key, *value, *old;
size_t pos;
if ([line length] == 0) {
intmax_t contentLength;
@try {
contentLength = [[_headers
|
| ︙ | ︙ | |||
495 496 497 498 499 500 501 502 503 504 505 506 507 508 |
key = [line substringWithRange: of_range(0, pos)];
value = [line substringWithRange:
of_range(pos + 1, [line length] - pos - 1)];
key = normalizedKey([key stringByDeletingTrailingWhitespaces]);
value = [value stringByDeletingLeadingWhitespaces];
[_headers setObject: value
forKey: key];
if ([key isEqual: @"Host"]) {
pos = [value
rangeOfString: @":"
options: OF_STRING_SEARCH_BACKWARDS].location;
| > > > > | 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 |
key = [line substringWithRange: of_range(0, pos)];
value = [line substringWithRange:
of_range(pos + 1, [line length] - pos - 1)];
key = normalizedKey([key stringByDeletingTrailingWhitespaces]);
value = [value stringByDeletingLeadingWhitespaces];
old = [_headers objectForKey: key];
if (old != nil)
value = [old stringByAppendingFormat: @",%@", value];
[_headers setObject: value
forKey: key];
if ([key isEqual: @"Host"]) {
pos = [value
rangeOfString: @":"
options: OF_STRING_SEARCH_BACKWARDS].location;
|
| ︙ | ︙ |