From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Mon, 28 Mar 2016 22:36:57 +0000 (+0200)
Subject: Fix HTTP connections to IPv6 address literals.
X-Git-Tag: 1.2.2~2
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=8077fd7663c0e79e4d42c9db55be1de02027a17d;ds=sidebyside

Fix HTTP connections to IPv6 address literals.
---

diff --git a/httpinput.cpp b/httpinput.cpp
index 4980fc1..0695727 100644
--- 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);