X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=e113c5717a76ac27ae6f1a52ae30c93a1b29e747;hp=f92ac13ca9ca010f1b2a8efb2d45cba68c40b12f;hb=dc109293b2644d5f1ac85a3f02b3584e82dcf690;hpb=0cb56be70f7ca4f4564eea892a99d20032359a1d

diff --git a/httpinput.cpp b/httpinput.cpp
index f92ac13..e113c57 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include <assert.h>
 #include <errno.h>
 #include <netdb.h>
@@ -9,6 +8,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
+#include <time.h>
 #include <unistd.h>
 #include <map>
 #include <string>
@@ -62,7 +62,9 @@ HTTPInput::HTTPInput(const InputProto &serialized)
 
 void HTTPInput::close_socket()
 {
-	safe_close(sock);
+	if (sock != -1) {
+		safe_close(sock);
+	}
 }
 
 InputProto HTTPInput::serialize() const
@@ -240,8 +242,8 @@ bool HTTPInput::parse_response(const std::string &request)
 		http_header.append(it->first + ": " + it->second + "\r\n");
 	}
 
-	for (size_t i = 0; i < stream_ids.size(); ++i) {
-		servers->set_header(stream_ids[i], http_header, "");
+	for (size_t i = 0; i < stream_indices.size(); ++i) {
+		servers->set_header(stream_indices[i], http_header, "");
 	}
 
 	return true;
@@ -264,8 +266,8 @@ void HTTPInput::do_work()
 			request_bytes_sent = 0;
 			response.clear();
 			pending_data.clear();
-			for (size_t i = 0; i < stream_ids.size(); ++i) {
-				servers->set_header(stream_ids[i], "", "");
+			for (size_t i = 0; i < stream_indices.size(); ++i) {
+				servers->set_header(stream_indices[i], "", "");
 			}
 
 			{
@@ -466,12 +468,12 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 		char *inner_data = pending_data.data() + sizeof(metacube_block_header);
 		if (flags & METACUBE_FLAGS_HEADER) {
 			string header(inner_data, inner_data + size);
-			for (size_t i = 0; i < stream_ids.size(); ++i) {
-				servers->set_header(stream_ids[i], http_header, header);
+			for (size_t i = 0; i < stream_indices.size(); ++i) {
+				servers->set_header(stream_indices[i], http_header, header);
 			}
 		} else { 
-			for (size_t i = 0; i < stream_ids.size(); ++i) {
-				servers->add_data(stream_ids[i], inner_data, size);
+			for (size_t i = 0; i < stream_indices.size(); ++i) {
+				servers->add_data(stream_indices[i], inner_data, size);
 			}
 		}