ObjFW  Diff

Differences From Artifact [0f4a35ed7a]:

To Artifact [17a72a5d36]:


292
293
294
295
296
297
298
299

300
301

302
303
304

305
306
307
308
309
310
311
292
293
294
295
296
297
298

299
300

301
302
303

304
305
306
307
308
309
310
311







-
+

-
+


-
+







- (OFString *)protocolVersionString
{
	return [OFString stringWithFormat: @"%hhu.%hhu",
					   _protocolVersion.major,
					   _protocolVersion.minor];
}

- (OFString *)string
- (OFString *)readString
{
	return [self stringWithEncoding: OFStringEncodingAutodetect];
	return [self readStringWithEncoding: OFStringEncodingAutodetect];
}

- (OFString *)stringWithEncoding: (OFStringEncoding)encoding
- (OFString *)readStringWithEncoding: (OFStringEncoding)encoding
{
	void *pool = objc_autoreleasePoolPush();
	OFString *contentType, *contentLengthString, *ret;
	OFData *data;

	if (encoding == OFStringEncodingAutodetect &&
	    (contentType = [_headers objectForKey: @"Content-Type"]) != nil)