Change the connected time from time_t to timespec.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index 68b91708e7b3059eeac08d3d62088daae2d90aa4..043c07c6fd2085d7b199470da796318e19ee850b 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -76,8 +76,8 @@ HTTPInput::HTTPInput(const InputProto &serialized)
        pending_data.resize(serialized.pending_data().size());
        memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());
 
-       string protocol;
-       parse_url(url, &protocol, &host, &port, &path);  // Don't care if it fails.
+       string protocol, user;
+       parse_url(url, &protocol, &user, &host, &port, &path);  // Don't care if it fails.
 
        pthread_mutex_init(&stats_mutex, NULL);
        stats.url = url;
@@ -94,6 +94,7 @@ void HTTPInput::close_socket()
 {
        if (sock != -1) {
                safe_close(sock);
+               sock = -1;
        }
 
        MutexLock lock(&stats_mutex);
@@ -339,8 +340,8 @@ void HTTPInput::do_work()
                        }
 
                        {
-                               string protocol;  // Thrown away.
-                               if (!parse_url(url, &protocol, &host, &port, &path)) {
+                               string protocol, user;  // Thrown away.
+                               if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
                                        log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str());
                                        break;
                                }
@@ -411,7 +412,7 @@ void HTTPInput::do_work()
                        RequestParseStatus status = wait_for_double_newline(&response, buf, ret);
                        
                        if (status == RP_OUT_OF_SPACE) {
-                               log(WARNING, "[%s] Sever sent overlong HTTP response!", url.c_str());
+                               log(WARNING, "[%s] Server sent overlong HTTP response!", url.c_str());
                                state = CLOSING_SOCKET;
                                continue;
                        } else if (status == RP_NOT_FINISHED_YET) {
@@ -548,7 +549,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                        has_metacube_header = false;
                        continue;
                }
-               if (size > 262144) {
+               if (size > 1048576) {
                        log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?",
                                url.c_str(), size, flags);
                }