Overview
| Comment: | OFURL: Do not normalize in init with relative URL |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
2b13f285c5fb8183eb3139790788251c |
| User & Date: | js on 2019-02-03 17:52:41 |
| Other Links: | manifest | tags |
Context
|
2019-02-03
| ||
| 19:19 | Move a few URL methods from OFString to OFURL check-in: f19cde3a14 user: js tags: trunk | |
| 17:52 | OFURL: Do not normalize in init with relative URL check-in: 2b13f285c5 user: js tags: trunk | |
| 11:31 | README.md: Add a table of contents check-in: 7f6c2d7e88 user: js tags: trunk | |
Changes
Modified src/OFURL.m from [d89b7c4c47] to [684f4e251d].
| ︙ | ︙ | |||
643 644 645 646 647 648 649 |
[OFCharacterSet URLQueryAllowedCharacterSet]);
}
if (*UTF8String == '/')
_URLEncodedPath = [[OFString alloc]
initWithUTF8String: UTF8String];
else {
| | < | | | > | > | > | > > > > > > > > > > > > > > > | < > | 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 |
[OFCharacterSet URLQueryAllowedCharacterSet]);
}
if (*UTF8String == '/')
_URLEncodedPath = [[OFString alloc]
initWithUTF8String: UTF8String];
else {
OFString *relativePath =
[OFString stringWithUTF8String: UTF8String];
if ([URL->_URLEncodedPath hasSuffix: @"/"])
_URLEncodedPath = [[URL->_URLEncodedPath
stringByAppendingString: relativePath]
copy];
else {
OFMutableString *path = [OFMutableString
stringWithString:
(URL->_URLEncodedPath != nil
? URL->_URLEncodedPath
: @"/")];
of_range_t range = [path
rangeOfString: @"/"
options: OF_STRING_SEARCH_BACKWARDS];
if (range.location == OF_NOT_FOUND)
@throw [OFInvalidFormatException
exception];
range.location++;
range.length = [path length] - range.location;
[path replaceCharactersInRange: range
withString: relativePath];
[path makeImmutable];
_URLEncodedPath = [path copy];
}
}
of_url_verify_escaped(_URLEncodedPath,
[OFCharacterSet URLPathAllowedCharacterSet]);
objc_autoreleasePoolPop(pool);
} @catch (id e) {
|
| ︙ | ︙ |
Modified tests/OFURLTests.m from [daf53235e7] to [2aa332308d].
| ︙ | ︙ | |||
74 75 76 77 78 79 80 | [[[OFURL URLWithString: @"foo/bar?q" relativeToURL: [OFURL URLWithString: @"http://h/qux/quux"]] string] isEqual: @"http://h/qux/foo/bar?q"] && [[[OFURL URLWithString: @"foo/bar" relativeToURL: [OFURL URLWithString: @"http://h/qux/?x"]] string] isEqual: @"http://h/qux/foo/bar"] && [[[OFURL URLWithString: @"http://foo/?q" | | > > > > > > | 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | [[[OFURL URLWithString: @"foo/bar?q" relativeToURL: [OFURL URLWithString: @"http://h/qux/quux"]] string] isEqual: @"http://h/qux/foo/bar?q"] && [[[OFURL URLWithString: @"foo/bar" relativeToURL: [OFURL URLWithString: @"http://h/qux/?x"]] string] isEqual: @"http://h/qux/foo/bar"] && [[[OFURL URLWithString: @"http://foo/?q" relativeToURL: u1] string] isEqual: @"http://foo/?q"] && [[[OFURL URLWithString: @"foo" relativeToURL: [OFURL URLWithString: @"http://foo/bar"]] string] isEqual: @"http://foo/foo"] && [[[OFURL URLWithString: @"foo" relativeToURL: [OFURL URLWithString: @"http://foo"]] string] isEqual: @"http://foo/foo"]) EXPECT_EXCEPTION( @"+[URLWithString:relativeToURL:] fails with invalid characters #1", OFInvalidFormatException, [OFURL URLWithString: @"`" relativeToURL: u1]) |
| ︙ | ︙ |