diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index b8b569ab1b..41d2e64259 100644
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -442,7 +442,7 @@ const char* wxURI::ParseServer(const char* uri)
         {
             m_hostType = wxURI_IPV6ADDRESS;
 
-            m_server.assign(start, uri - start - 1);
+            m_server.assign(start + 1, uri - start - 1);
             ++uri;
         }
         else
@@ -453,7 +453,7 @@ const char* wxURI::ParseServer(const char* uri)
             {
                 m_hostType = wxURI_IPVFUTURE;
 
-                m_server.assign(start, uri - start - 1);
+                m_server.assign(start + 1, uri - start - 1);
                 ++uri;
             }
             else // unrecognized IP literal
@@ -468,7 +468,7 @@ const char* wxURI::ParseServer(const char* uri)
         {
             m_hostType = wxURI_IPV4ADDRESS;
 
-            m_server.assign(start, uri - start - 1);
+            m_server.assign(start, uri - start);
         }
         else
         {
diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index f3d22a2098..e4920fcec6 100644
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -45,6 +45,7 @@ private:
     CPPUNIT_TEST_SUITE( URITestCase );
         CPPUNIT_TEST( IPv4 );
         CPPUNIT_TEST( IPv6 );
+        CPPUNIT_TEST( Server );
         CPPUNIT_TEST( Paths );
         CPPUNIT_TEST( NormalResolving );
         CPPUNIT_TEST( ComplexResolving );
@@ -65,6 +66,7 @@ private:
 
     void IPv4();
     void IPv6();
+    void Server();
     void Paths();
     void NormalResolving();
     void ComplexResolving();
@@ -103,6 +105,9 @@ URITestCase::URITestCase()
 #define URI_ASSERT_HOSTTYPE_EQUAL(uri, expected) \
     URI_ASSERT_PART_EQUAL((uri), (expected), GetHostType())
 
+#define URI_ASSERT_SERVER_EQUAL(uri, expected) \
+    URI_ASSERT_PART_EQUAL((uri), (expected), GetServer())
+
 #define URI_ASSERT_PATH_EQUAL(uri, expected) \
     URI_ASSERT_PART_EQUAL((uri), (expected), GetPath())
 
@@ -157,6 +162,18 @@ void URITestCase::IPv6()
     );
 }
 
+void URITestCase::Server()
+{
+    URI_ASSERT_SERVER_EQUAL("http://foo/", "foo");
+    URI_ASSERT_SERVER_EQUAL("http://foo-bar/", "foo-bar");
+    URI_ASSERT_SERVER_EQUAL("http://foo/bar/", "foo");
+    URI_ASSERT_SERVER_EQUAL("http://192.168.1.0/", "192.168.1.0");
+    URI_ASSERT_SERVER_EQUAL("http://192.168.1.17/", "192.168.1.17");
+    URI_ASSERT_SERVER_EQUAL("http://192.168.1.255/", "192.168.1.255");
+    URI_ASSERT_SERVER_EQUAL("http://192.168.1.1/index.html", "192.168.1.1");
+    URI_ASSERT_SERVER_EQUAL("http://[aa:aa:aa:aa::aa:aa]/foo", "aa:aa:aa:aa::aa:aa");
+}
+
 void URITestCase::Paths()
 {
     URI_ASSERT_PATH_EQUAL("http://user:password@192.256.1.100:5050/../path",