X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=httpinput.cpp;h=46f1358927312ba210cfa2f518e29991595d14ed;hb=d60b2c17baf9b71e4a70a499fa1d34753821c822;hp=1db4f91f16e0221f6afcf886111142d7a36a097e;hpb=239a9eab1a2468b401183745a24b2fbd590a6998;p=cubemap

diff --git a/httpinput.cpp b/httpinput.cpp
index 1db4f91..46f1358 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -23,6 +23,7 @@
 #include "server.h"
 #include "serverpool.h"
 #include "parse.h"
+#include "version.h"
 #include "state.pb.h"
 
 using namespace std;
@@ -163,7 +164,7 @@ bool HTTPInput::parse_response(const std::string &request)
 	// TODO: Make case-insensitive.
 	// XXX: Use a Via: instead?
 	if (parameters.count("Server") == 0) {
-		parameters.insert(make_pair("Server", "metacube/0.1"));
+		parameters.insert(make_pair("Server", SERVER_IDENTIFICATION));
 	} else {
 		for (multimap<string, string>::iterator it = parameters.begin();
 		     it != parameters.end();
@@ -171,7 +172,7 @@ bool HTTPInput::parse_response(const std::string &request)
 			if (it->first != "Server") {
 				continue;
 			}
-			it->second = "metacube/0.1 (reflecting: " + it->second + ")";
+			it->second = SERVER_IDENTIFICATION " (reflecting: " + it->second + ")";
 		}
 	}
 
@@ -214,6 +215,7 @@ void HTTPInput::do_work()
 			request.clear();
 			request_bytes_sent = 0;
 			response.clear();
+			pending_data.clear();
 
 			{
 				string protocol;  // Thrown away.