Fix HTTP connections to IPv6 address literals.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index 374441c32b30e604ec436f8cd62b8f058ed761d8..069572753eaef9b04617eb2f1329f8e8e26615f1 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -328,6 +328,13 @@ void HTTPInput::do_work()
                                        log(WARNING, "[%s] Failed to parse URL '%s'", url.c_str(), url.c_str());
                                        break;
                                }
+
+                               // Remove the brackets around IPv6 address literals.
+                               // TODO: See if we can join this with the code in parse_ip_address(),
+                               // or maybe even more it into parse_url().
+                               if (!host.empty() && host[0] == '[' && host[host.size() - 1] == ']') {
+                                       host = host.substr(1, host.size() - 2);
+                               }
                        }
 
                        sock = lookup_and_connect(host, port);
@@ -532,8 +539,8 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                        has_metacube_header = false;
                        continue;
                }
-               if (size > 1048576) {
-                       log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?",
+               if (size > 10485760) {
+                       log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header??",
                                url.c_str(), size, flags);
                }