@@ -930,10 +930,13 @@
 
 	if (!_hasContentLength && !_chunked)
 		return [_socket readIntoBuffer: buffer
 					length: length];
 
+	if ([_socket isAtEndOfStream])
+		@throw [OFTruncatedDataException exception];
+
 	/* Content-Length */
 	if (!_chunked) {
 		size_t ret;
 
 		if (length > _toRead)