YaHTTP: Parse addresses with IPv6 literals

A URL like http://[::1]:81 are parsed correctly now.

diff --git a/ext/yahttp/yahttp/url.hpp b/ext/yahttp/yahttp/url.hpp
index 0002c29339bc0b3702366d8be2f38b6643f4559a..fbdd48de86509e5595c51a094189e422c27d5879 100644 (file)
--- a/ext/yahttp/yahttp/url.hpp
+++ b/ext/yahttp/yahttp/url.hpp
@@ -38,7 +38,18 @@ namespace YaHTTP {
              host = url.substr(pos, pos1-pos);
              pos = pos1;
           }
-          if ( (pos1 = host.find_first_of(":")) != std::string::npos ) {
+          if (host.at(0) == '[') { // IPv6
+            if ((pos1 = host.find_first_of("]")) == std::string::npos) {
+              // incomplete address
+              return false;
+            }
+            size_t pos2;
+            if ((pos2 = host.find_first_of(":", pos1)) != std::string::npos) {
+              std::istringstream tmp(host.substr(pos2 + 1));
+              tmp >> port;
+            }
+            host = host.substr(1, pos1 - 1);
+          } else if ( (pos1 = host.find_first_of(":")) != std::string::npos ) {
              std::istringstream tmp(host.substr(pos1+1));
              tmp >> port;
              host = host.substr(0, pos1);