X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=275df501f6fb9c92b44d3023091852076595ec40;hp=e113c5717a76ac27ae6f1a52ae30c93a1b29e747;hb=ff78f87ecc83e472f8c649eb0b8503a483e393ff;hpb=7b3d494100ef1063578b1ef76818baee4ab53ada

diff --git a/httpinput.cpp b/httpinput.cpp
index e113c57..275df50 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -86,17 +86,16 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 {
 	addrinfo *ai;
 	int err = getaddrinfo(host.c_str(), port.c_str(), NULL, &ai);
-	if (err == -1) {
+	if (err != 0) {
 		log(WARNING, "[%s] Lookup of '%s' failed (%s).",
 			url.c_str(), host.c_str(), gai_strerror(err));
-		freeaddrinfo(ai);
 		return -1;
 	}
 
 	addrinfo *base_ai = ai;
 
 	// Connect to everything in turn until we have a socket.
-	while (ai && !should_stop()) {
+	for ( ; ai && !should_stop(); ai = ai->ai_next) {
 		int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
 		if (sock == -1) {
 			// Could be e.g. EPROTONOSUPPORT. The show must go on.
@@ -154,7 +153,6 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 		}
 
 		safe_close(sock);
-		ai = ai->ai_next;
 	}
 
 	// Give the last one as error.
@@ -266,6 +264,7 @@ void HTTPInput::do_work()
 			request_bytes_sent = 0;
 			response.clear();
 			pending_data.clear();
+			has_metacube_header = false;
 			for (size_t i = 0; i < stream_indices.size(); ++i) {
 				servers->set_header(stream_indices[i], "", "");
 			}
@@ -387,7 +386,7 @@ void HTTPInput::do_work()
 
 			if (ret == 0) {
 				// This really shouldn't happen...
-				log(ERROR, "[%s] Socket unexpectedly closed while reading header",
+				log(ERROR, "[%s] Socket unexpectedly closed while reading data",
 				           url.c_str());
 				state = CLOSING_SOCKET;
 				continue;