@@ -618,11 +618,11 @@
 	return false;
 }
 
 - (void)createResponse
 {
-	OFURL *URL;
+	OFMutableURL *URL;
 	OFHTTPRequest *request;
 	OFHTTPServerResponse *response;
 	size_t pos;
 
 	[_timer invalidate];
@@ -638,11 +638,11 @@
 		[_host release];
 		_host = [[_server host] retain];
 		_port = [_server port];
 	}
 
-	URL = [OFURL URL];
+	URL = [OFMutableURL URL];
 	[URL setScheme: @"http"];
 	[URL setHost: _host];
 	[URL setPort: _port];
 
 	if ((pos = [_path rangeOfString: @"?"].location) != OF_NOT_FOUND) {
@@ -654,10 +654,12 @@
 
 		[URL setPath: path];
 		[URL setQuery: query];
 	} else
 		[URL setPath: _path];
+
+	[URL makeImmutable];
 
 	request = [OFHTTPRequest requestWithURL: URL];
 	[request setMethod: _method];
 	[request setProtocolVersion:
 	    (of_http_request_protocol_version_t){ 1, _HTTPMinorVersion }];