@@ -13,10 +13,11 @@
  * file.
  */
 
 #include "config.h"
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
 #import "OFHTTPServer.h"
 #import "OFArray.h"
@@ -226,12 +227,22 @@
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	if (!_headersSent)
 		[self of_sendHeaders];
 
-	if (!_chunked)
-		return [_socket writeBuffer: buffer length: length];
+	if (!_chunked) {
+		@try {
+			[_socket writeBuffer: buffer length: length];
+		} @catch (OFWriteFailedException *e) {
+			if (e.errNo == EWOULDBLOCK)
+				return e.bytesWritten;
+
+			@throw e;
+		}
+
+		return length;
+	}
 
 	pool = objc_autoreleasePoolPush();
 	[_socket writeString: [OFString stringWithFormat: @"%zX\r\n", length]];
 	objc_autoreleasePoolPop(pool);