Create HTTP responses with the stream that they will be sent to, for 100

Continue support.

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/httpserver/HTTPServer.cpp b/lib/httpserver/HTTPServer.cpp
index fbdadfa7..b8b02249 100644
--- a/lib/httpserver/HTTPServer.cpp
+++ b/lib/httpserver/HTTPServer.cpp
@@ -152,7 +152,7 @@ void HTTPServer::Connection(SocketStream &rStream)
 		}
 	
 		// Generate a response
-		HTTPResponse response;
+		HTTPResponse response(&rStream);
 		try
 		{
 			Handle(request, response);
@@ -183,7 +183,7 @@ void HTTPServer::Connection(SocketStream &rStream)
 		}
 	
 		// Send the response (omit any content if this is a HEAD method request)
-		response.Send(rStream, request.GetMethod() == HTTPRequest::Method_HEAD);
+		response.Send(request.GetMethod() == HTTPRequest::Method_HEAD);
 	}
 
 	// Notify derived claases
@@ -209,7 +209,7 @@ void HTTPServer::SendInternalErrorResponse(const char *Error, SocketStream &rStr
 			"</body>\n</html>\n"
 
 	// Generate the error page
-	HTTPResponse response;
+	HTTPResponse response(&rStream);
 	response.SetResponseCode(HTTPResponse::Code_InternalServerError);
 	response.SetContentType("text/html");
 	response.Write(ERROR_HTML_1, sizeof(ERROR_HTML_1) - 1);
@@ -217,7 +217,7 @@ void HTTPServer::SendInternalErrorResponse(const char *Error, SocketStream &rStr
 	response.Write(ERROR_HTML_2, sizeof(ERROR_HTML_2) - 1);
 
 	// Send the error response
-	response.Send(rStream);
+	response.Send();
 }
 
 
diff --git a/lib/httpserver/HTTPServer.h b/lib/httpserver/HTTPServer.h
index 9a86b04f..8009438d 100644
--- a/lib/httpserver/HTTPServer.h
+++ b/lib/httpserver/HTTPServer.h
@@ -46,7 +46,7 @@ public:
 	//		Created: 26/3/04
 	//
 	// --------------------------------------------------------------------------
-	virtual void Handle(const HTTPRequest &rRequest, HTTPResponse &rResponse) = 0;
+	virtual void Handle(HTTPRequest &rRequest, HTTPResponse &rResponse) = 0;
 	
 	// For notifications to derived classes
 	virtual void HTTPConnectionOpening();