Index: src/OFHTTPServer.m
==================================================================
--- src/OFHTTPServer.m
+++ src/OFHTTPServer.m
@@ -458,10 +458,11 @@
 	OFHTTPRequestResult *reply;
 	OFDictionary *replyHeaders;
 	OFDataArray *replyData;
 	OFEnumerator *keyEnumerator, *valueEnumerator;
 	OFString *key, *value;
+	size_t pos;
 
 	[timer invalidate];
 	[timer release];
 	timer = nil;
 
@@ -477,11 +478,22 @@
 
 	URL = [OFURL URL];
 	[URL setScheme: @"http"];
 	[URL setHost: host];
 	[URL setPort: port];
-	[URL setPath: path];
+
+	if ((pos = [path rangeOfString: @"?"].location) != OF_NOT_FOUND) {
+		OFString *path_, *query;
+
+		path_ = [path substringWithRange: of_range(0, pos)];
+		query = [path substringWithRange:
+		    of_range(pos + 1, [path length] - pos - 1)];
+
+		[URL setPath: path_];
+		[URL setQuery: query];
+	} else
+		[URL setPath: path];
 
 	request = [OFHTTPRequest requestWithURL: URL];
 	[request setRequestType: requestType];
 	[request setHeaders: headers];
 	[request setPOSTData: POSTData];