@@ -226,11 +226,11 @@
 
 	/*
 	 * Work around a bug with packet bisection in lighttpd when using
 	 * HTTPS.
 	 */
-	[sock setBuffersWrites: YES];
+	[sock setWriteBufferEnabled: YES];
 
 	if (requestType == OF_HTTP_REQUEST_TYPE_GET)
 		type = "GET";
 	if (requestType == OF_HTTP_REQUEST_TYPE_HEAD)
 		type = "HEAD";
@@ -272,11 +272,11 @@
 
 	[sock writeString: @"\r\n"];
 
 	/* Work around a bug in lighttpd, see above */
 	[sock flushWriteBuffer];
-	[sock setBuffersWrites: NO];
+	[sock setWriteBufferEnabled: NO];
 
 	if (requestType == OF_HTTP_REQUEST_TYPE_POST)
 		[sock writeString: queryString];
 
 	@try {
@@ -420,12 +420,12 @@
 
 				while (toRead > 0) {
 					size_t length = (toRead < of_pagesize
 					    ? toRead : of_pagesize);
 
-					length = [sock readNBytes: length
-						       intoBuffer: buffer];
+					length = [sock readIntoBuffer: buffer
+							       length: length];
 
 					[delegate request: self
 					   didReceiveData: buffer
 					       withLength: length];
 					[pool2 releaseObjects];
@@ -451,12 +451,13 @@
 				[pool2 releaseObjects];
 			}
 		} else {
 			size_t length;
 
-			while ((length = [sock readNBytes: of_pagesize
-					       intoBuffer: buffer]) > 0) {
+			while ((length = [sock
+			    readIntoBuffer: buffer
+				    length: of_pagesize]) > 0) {
 				[delegate request: self
 				   didReceiveData: buffer
 				       withLength: length];
 				[pool2 releaseObjects];