Misc changes in HTTP code.

1 files changed, 4 insertions, 10 deletions

diff --git a/httpd.cpp b/httpd.cpp
index 8eac976..6da58b1 100644
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -18,29 +18,23 @@ void HTTPConnection::handle_write(const boost::system::error_code& error, size_t
 
 void HTTPConnection::handle_read(const boost::system::error_code& error, size_t bytes_transferred) {
 	std::istream is(&buf);
-
 	HTTPRequest req(is);
 
-	boost::asio::streambuf b;
-	std::ostream os(&b);
+	boost::asio::streambuf hdr_buf, data_buf;
+	std::ostream hdr_os(&hdr_buf), data_os(&data_buf);
 
-	HTTPResponse res;
+	HTTPResponse res(socket);
 
 	MusicListing *ml = music::find(req.path);
 	if(ml) {
 		res.code = 200;
 		res.status = "OK";
-		res.add_header("content-type", "text/html");
-		res.write_headers(os);
 
-		ml->render(os);
+		ml->render(res);
 	} else {
 		res.code = 404;
 		res.status = "Not Found";
-		res.write_headers(os);
 	}
-
-	boost::asio::write(socket, b);
 }
 
 HTTPConnection::pointer HTTPConnection::create(boost::asio::io_service& io_service) {