Index: src/OFHTTPClient.m
==================================================================
--- src/OFHTTPClient.m
+++ src/OFHTTPClient.m
@@ -119,11 +119,11 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFURL *URL = [request URL];
 	OFString *scheme = [URL scheme];
 	of_http_request_type_t requestType = [request requestType];
 	OFDictionary *headers = [request headers];
-	OFDataArray *postData = [request postData];
+	OFDataArray *POSTData = [request POSTData];
 	OFTCPSocket *sock;
 	OFHTTPRequestResult *result;
 	OFString *line, *path, *version;
 	OFMutableDictionary *serverHeaders;
 	OFDataArray *data;
@@ -207,22 +207,22 @@
 			contentType = @"application/x-www-form-urlencoded; "
 			    @"charset=UTF-8\r\n";
 
 		[sock writeFormat: @"Content-Type: %@\r\n", contentType];
 		[sock writeFormat: @"Content-Length: %d\r\n",
-		    [postData count] * [postData itemSize]];
+		    [POSTData count] * [POSTData itemSize]];
 	}
 
 	[sock writeString: @"\r\n"];
 
 	/* Work around a bug in lighttpd, see above */
 	[sock flushWriteBuffer];
 	[sock setWriteBufferEnabled: NO];
 
 	if (requestType == OF_HTTP_REQUEST_TYPE_POST)
-		[sock writeBuffer: [postData cArray]
-			   length: [postData count] * [postData itemSize]];
+		[sock writeBuffer: [POSTData cArray]
+			   length: [POSTData count] * [POSTData itemSize]];
 
 	@try {
 		line = [sock readLine];
 	} @catch (OFInvalidEncodingException *e) {
 		@throw [OFInvalidServerReplyException
@@ -314,17 +314,17 @@
 			}
 
 			newRequest = [OFHTTPRequest requestWithURL: newURL];
 			[newRequest setRequestType: requestType];
 			[newRequest setHeaders: headers];
-			[newRequest setPostData: postData];
+			[newRequest setPOSTData: POSTData];
 			[newRequest setMIMEType: [request MIMEType]];
 
 			if (status == 303) {
 				[newRequest
 				    setRequestType: OF_HTTP_REQUEST_TYPE_GET];
-				[newRequest setPostData: nil];
+				[newRequest setPOSTData: nil];
 				[newRequest setMIMEType: nil];
 			}
 
 			[newRequest retain];
 			objc_autoreleasePoolPop(pool);

Index: src/OFHTTPRequest.h
==================================================================
--- src/OFHTTPRequest.h
+++ src/OFHTTPRequest.h
@@ -33,19 +33,19 @@
 @interface OFHTTPRequest: OFObject
 {
 	OFURL *URL;
 	of_http_request_type_t requestType;
 	OFDictionary *headers;
-	OFDataArray *postData;
+	OFDataArray *POSTData;
 	OFString *MIMEType;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (copy) OFURL *URL;
 @property of_http_request_type_t requestType;
 @property (copy) OFDictionary *headers;
-@property (retain) OFDataArray *postData;
+@property (retain) OFDataArray *POSTData;
 @property (copy) OFString *MIMEType;
 #endif
 
 /*!
  * @brief Creates a new OFHTTPRequest.
@@ -113,20 +113,20 @@
 - (OFDictionary*)headers;
 
 /*!
  * @brief Sets the POST data of the HTTP request.
  *
- * @param postData The POST data of the HTTP request
+ * @param POSTData The POST data of the HTTP request
  */
-- (void)setPostData: (OFDataArray*)postData;
+- (void)setPOSTData: (OFDataArray*)postData;
 
 /*!
  * @brief Returns the POST data of the HTTP request.
  *
  * @return The POST data of the HTTP request
  */
-- (OFDataArray*)postData;
+- (OFDataArray*)POSTData;
 
 /*!
  * @brief Sets the MIME type for the POST data.
  *
  * @param MIMEType The MIME type for the POST data

Index: src/OFHTTPRequest.m
==================================================================
--- src/OFHTTPRequest.m
+++ src/OFHTTPRequest.m
@@ -60,11 +60,11 @@
 
 - (void)dealloc
 {
 	[URL release];
 	[headers release];
-	[postData release];
+	[POSTData release];
 	[MIMEType release];
 
 	[super dealloc];
 }
 
@@ -96,18 +96,18 @@
 - (OFDictionary*)headers
 {
 	OF_GETTER(headers, YES)
 }
 
-- (void)setPostData: (OFDataArray*)postData_
+- (void)setPOSTData: (OFDataArray*)POSTData_
 {
-	OF_SETTER(postData, postData_, YES, 0)
+	OF_SETTER(POSTData, POSTData_, YES, 0)
 }
 
-- (OFDataArray*)postData
+- (OFDataArray*)POSTData
 {
-	OF_GETTER(postData, YES)
+	OF_GETTER(POSTData, YES)
 }
 
 - (void)setMIMEType: (OFString*)MIMEType_
 {
 	OF_SETTER(MIMEType, MIMEType_, YES, 1)
@@ -134,20 +134,20 @@
 		data: (OFDataArray*)data_
 {
 	self = [super init];
 
 	statusCode = status;
-	data = [data_ retain];
 	headers = [headers_ copy];
+	data = [data_ retain];
 
 	return self;
 }
 
 - (void)dealloc
 {
-	[data release];
 	[headers release];
+	[data release];
 
 	[super dealloc];
 }
 
 - (short)statusCode

Index: src/OFHTTPServer.m
==================================================================
--- src/OFHTTPServer.m
+++ src/OFHTTPServer.m
@@ -180,11 +180,11 @@
 	of_http_request_type_t requestType;
 	OFString *host, *path;
 	uint16_t port;
 	OFMutableDictionary *headers;
 	size_t contentLength;
-	OFDataArray *postData;
+	OFDataArray *POSTData;
 }
 
 - initWithSocket: (OFTCPSocket*)socket
 	  server: (OFHTTPServer*)server;
 - (BOOL)socket: (OFTCPSocket*)sock
@@ -217,11 +217,11 @@
 {
 	[sock release];
 	[host release];
 	[path release];
 	[headers release];
-	[postData release];
+	[POSTData release];
 
 	[super dealloc];
 }
 
 - (BOOL)socket: (OFTCPSocket*)sock_
@@ -330,11 +330,11 @@
 			} @catch (OFInvalidFormatException *e) {
 				return [self sendErrorAndClose: 400];
 			}
 
 			buffer = [self allocMemoryWithSize: BUFFER_SIZE];
-			postData = [[OFDataArray alloc] init];
+			POSTData = [[OFDataArray alloc] init];
 
 			[sock asyncReadIntoBuffer: buffer
 					   length: BUFFER_SIZE
 					   target: self
 					 selector: @selector(socket:
@@ -398,14 +398,14 @@
 	  exception: (OFException*)exception
 {
 	if ([sock_ isAtEndOfStream] || exception != nil)
 		return NO;
 
-	[postData addItemsFromCArray: buffer
+	[POSTData addItemsFromCArray: buffer
 			       count: length];
 
-	if ([postData count] >= contentLength) {
+	if ([POSTData count] >= contentLength) {
 		@try {
 			[self sendReply];
 		} @catch (OFWriteFailedException *e) {
 			return NO;
 		}
@@ -459,11 +459,11 @@
 	[URL setPath: path];
 
 	request = [OFHTTPRequest requestWithURL: URL];
 	[request setRequestType: requestType];
 	[request setHeaders: headers];
-	[request setPostData: postData];
+	[request setPOSTData: POSTData];
 
 	reply = [[server delegate] server: server
 			didReceiveRequest: request];
 
 	if (reply == nil) {