From 81c7ccff78169c363aa954335f4a6875768e8cac Mon Sep 17 00:00:00 2001
From: Maia Everett <maia@lucidfox.org>
Date: Thu, 9 Oct 2014 16:26:11 +0700
Subject: [PATCH] Bracket IPv6 host names if not bracketed by servlet
 container. #959

---
 .../org/restlet/ext/servlet/internal/ServletCall.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/internal/ServletCall.java b/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/internal/ServletCall.java
index c11ad1cf38..004786d704 100644
--- a/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/internal/ServletCall.java
+++ b/modules/org.restlet.ext.servlet/src/org/restlet/ext/servlet/internal/ServletCall.java
@@ -164,7 +164,14 @@ public int getClientPort() {
      */
     @Override
     public String getHostDomain() {
-        return getRequest().getServerName();
+        String serverName = getRequest().getServerName();
+        
+        // Check if the servlet container returned an unbracketed IPv6 address
+        if (serverName.indexOf(':') != -1 && serverName.indexOf('[') == -1) {
+            return '[' + serverName + ']';
+        } else {
+            return serverName;
+        }
     }
 
     /**