Add a hack for starting at the _start_ of backlog. Useful for fetching samples of...

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index c30651ed3e5c42100a7f5cc0d16f56e8b7c7751f..7da8daa1d85e732be755236a780d010a82e9cd4e 100644 (file)
--- 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
@@ -385,7 +387,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;