@@ -24,11 +24,11 @@
 #import "OFHTTPResponse.h"
 #import "OFString.h"
 #import "OFURL.h"
 #import "OFTCPSocket.h"
 #import "OFDictionary.h"
-#import "OFDataArray.h"
+#import "OFData.h"
 
 #import "OFHTTPRequestFailedException.h"
 #import "OFInvalidEncodingException.h"
 #import "OFInvalidFormatException.h"
 #import "OFInvalidServerReplyException.h"
@@ -323,11 +323,11 @@
 	of_http_request_method_t method = [request method];
 	OFString *path;
 	OFMutableString *requestString;
 	OFString *user, *password;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *headers;
-	OFDataArray *body = [request body];
+	OFData *body = [request body];
 	OFTCPSocket *socket;
 	OFHTTPClientResponse *response;
 	OFString *line, *version, *redirect, *connectionHeader;
 	bool keepAlive;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *serverHeaders;
@@ -418,11 +418,11 @@
 	user = [URL user];
 	password = [URL password];
 
 	if (([user length] > 0 || [password length] > 0) &&
 	    [headers objectForKey: @"Authorization"] == nil) {
-		OFDataArray *authorizationData = [OFDataArray dataArray];
+		OFMutableData *authorizationData = [OFMutableData data];
 		OFString *authorization;
 
 		[authorizationData addItems: [user UTF8String]
 				      count: [user UTF8StringLength]];
 		[authorizationData addItem: ":"];