@@ -767,15 +767,13 @@
 	[_handler release];
 
 	[super dealloc];
 }
 
-- (size_t)lowlevelWriteBuffer: (const void *)buffer
-		       length: (size_t)length
+- (size_t)lowlevelWriteBuffer: (const void *)buffer length: (size_t)length
 {
-	size_t requestedLength = length;
-	size_t ret;
+	/* TODO: Use non-blocking writes */
 
 	if (_socket == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	/*
@@ -785,43 +783,32 @@
 	 */
 	if (length == 0)
 		return 0;
 
 	if (_atEndOfStream)
-		@throw [OFWriteFailedException
-		    exceptionWithObject: self
-			requestedLength: requestedLength
-			   bytesWritten: 0
-				  errNo: 0];
+		@throw [OFWriteFailedException exceptionWithObject: self
+						   requestedLength: length
+						      bytesWritten: 0
+							     errNo: ENOTCONN];
 
 	if (_chunked)
 		[_socket writeFormat: @"%zX\r\n", length];
 	else if (length > _toWrite)
-		length = (size_t)_toWrite;
+		@throw [OFOutOfRangeException exception];
 
-	ret = [_socket writeBuffer: buffer length: length];
+	[_socket writeBuffer: buffer length: length];
 	if (_chunked)
 		[_socket writeString: @"\r\n"];
 
-	if (ret > length)
-		@throw [OFOutOfRangeException exception];
-
 	if (!_chunked) {
-		_toWrite -= ret;
+		_toWrite -= length;
 
 		if (_toWrite == 0)
 			_atEndOfStream = true;
 	}
 
-	if (requestedLength > length)
-		@throw [OFWriteFailedException
-		    exceptionWithObject: self
-			requestedLength: requestedLength
-			   bytesWritten: ret
-				  errNo: 0];
-
-	return ret;
+	return length;
 }
 
 - (bool)lowlevelIsAtEndOfStream
 {
 	return _atEndOfStream;