ObjFW  Diff

Differences From Artifact [7bcf69b951]:

To Artifact [53242c671e]:


109
110
111
112
113
114
115
116

117
118

119


120

121
122

123
124
125
126
127
128
129
109
110
111
112
113
114
115

116
117

118
119
120
121

122
123

124
125
126
127
128
129
130
131







-
+

-
+

+
+
-
+

-
+








	if (encoding == OF_STRING_ENCODING_AUTODETECT &&
	    (contentType = [_headers objectForKey: @"Content-Type"]) != nil) {
		contentType = [contentType lowercaseString];

		if ([contentType hasSuffix: @"charset=utf-8"])
			encoding = OF_STRING_ENCODING_UTF_8;
		if ([contentType hasSuffix: @"charset=iso-8859-1"])
		else if ([contentType hasSuffix: @"charset=iso-8859-1"])
			encoding = OF_STRING_ENCODING_ISO_8859_1;
		if ([contentType hasSuffix: @"charset=iso-8859-15"])
		else if ([contentType hasSuffix: @"charset=iso-8859-15"])
			encoding = OF_STRING_ENCODING_ISO_8859_15;
		else if ([contentType hasSuffix: @"charset=windows-1251"])
			encoding = OF_STRING_ENCODING_WINDOWS_1251;
		if ([contentType hasSuffix: @"charset=windows-1252"])
		else if ([contentType hasSuffix: @"charset=windows-1252"])
			encoding = OF_STRING_ENCODING_WINDOWS_1252;
		if ([contentType hasSuffix: @"charset=macintosh"])
		else if ([contentType hasSuffix: @"charset=macintosh"])
			encoding = OF_STRING_ENCODING_MAC_ROMAN;
	}

	if (encoding == OF_STRING_ENCODING_AUTODETECT)
		encoding = OF_STRING_ENCODING_UTF_8;

	data = [self readDataArrayTillEndOfStream];