Differences From Artifact [e165bf4e50]:
- File
src/OFString.m
— part of check-in
[e810b8ab15]
at
2012-07-01 20:56:42
on branch runtime
— Reference OFConstantString in OFString.
This is necessary for static linking. Without this, the runtime keeps
static instances of class OFConstantString forever in its list of
objects to initialize. This resulted in string literals still having
their isa set to Nil and thus a crash on the first dispatch. (user: js, size: 45339) [annotate] [blame] [check-ins using] [more...]
To Artifact [a7f2176e75]:
- File src/OFString.m — part of check-in [ba0a921534] at 2012-07-04 20:31:33 on branch trunk — Fix a bug in -[initWithContentsOfURL:encoding:]. (user: js, size: 45299) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
863 864 865 866 867 868 869 | - initWithContentsOfURL: (OFURL*)URL encoding: (of_string_encoding_t)encoding { OFAutoreleasePool *pool; OFHTTPRequest *request; OFHTTPRequestResult *result; | | | 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 | - initWithContentsOfURL: (OFURL*)URL encoding: (of_string_encoding_t)encoding { OFAutoreleasePool *pool; OFHTTPRequest *request; OFHTTPRequestResult *result; OFString *contentType; Class c; c = isa; [self release]; pool = [[OFAutoreleasePool alloc] init]; |
︙ | ︙ | |||
892 893 894 895 896 897 898 | @throw [OFHTTPRequestFailedException exceptionWithClass: [request class] HTTPRequest: request result: result]; if (encoding == OF_STRING_ENCODING_AUTODETECT && (contentType = [[result headers] objectForKey: @"Content-Type"])) { | < | | | 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 | @throw [OFHTTPRequestFailedException exceptionWithClass: [request class] HTTPRequest: request result: result]; if (encoding == OF_STRING_ENCODING_AUTODETECT && (contentType = [[result headers] objectForKey: @"Content-Type"])) { contentType = [contentType lowercaseString]; if ([contentType hasSuffix: @"charset=utf-8"]) encoding = OF_STRING_ENCODING_UTF_8; if ([contentType hasSuffix: @"charset=iso-8859-1"]) encoding = OF_STRING_ENCODING_ISO_8859_1; if ([contentType hasSuffix: @"charset=iso-8859-15"]) encoding = OF_STRING_ENCODING_ISO_8859_15; if ([contentType hasSuffix: @"charset=windows-1252"]) encoding = OF_STRING_ENCODING_WINDOWS_1252; |
︙ | ︙ |