Support joining multicast addresses (both ASM and SSM).

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index c975a2497007c1d45605ce73103f5405be4c78ed..e2cc1975a44e56a4d84bd454ceaea4ae733d7118 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -76,15 +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.
-
-       // Older versions stored the extra \r\n in the HTTP header.
-       // Strip it if we find it.
-       if (http_header.size() >= 4 &&
-           memcmp(http_header.data() + http_header.size() - 4, "\r\n\r\n", 4) == 0) {
-               http_header.resize(http_header.size() - 2);
-       }
+       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;
@@ -101,6 +94,7 @@ void HTTPInput::close_socket()
 {
        if (sock != -1) {
                safe_close(sock);
+               sock = -1;
        }
 
        MutexLock lock(&stats_mutex);
@@ -346,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;
                                }