Index: src/OFHTTPRequest.m
==================================================================
--- src/OFHTTPRequest.m
+++ src/OFHTTPRequest.m
@@ -208,17 +208,16 @@
 
 	@try {
 		OFString *line, *path;
 		OFMutableDictionary *serverHeaders;
 		OFDataArray *data;
-		OFEnumerator *enumerator;
-		OFString *key;
+		OFEnumerator *keyEnumerator, *objectEnumerator;
+		OFString *key, *object, *contentLengthHeader;
 		int status;
 		const char *type = NULL;
 		char *buffer;
 		size_t bytesReceived;
-		OFString *contentLengthHeader;
 
 		[sock connectToHost: [URL host]
 			     onPort: [URL port]];
 
 		/*
@@ -247,15 +246,16 @@
 			[sock writeFormat: @"Host: %@\r\n", [URL host]];
 		else
 			[sock writeFormat: @"Host: %@:%d\r\n", [URL host],
 					   [URL port]];
 
-		enumerator = [headers keyEnumerator];
+		keyEnumerator = [headers keyEnumerator];
+		objectEnumerator = [headers objectEnumerator];
 
-		while ((key = [enumerator nextObject]) != nil)
-			[sock writeFormat: @"%@: %@\r\n",
-					   key, [headers objectForKey: key]];
+		while ((key = [keyEnumerator nextObject]) != nil &&
+		    (object = [objectEnumerator nextObject]) != nil)
+			[sock writeFormat: @"%@: %@\r\n", key, object];
 
 		if (requestType == OF_HTTP_REQUEST_TYPE_POST) {
 			if ([headers objectForKey: @"Content-Type"] == nil)
 				[sock writeString: @"Content-Type: "
 				   @"application/x-www-form-urlencoded\r\n"];