Merge remote-tracking branch 'origin/jetty-9.3.x'

jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java

@@ -302,10 +302,6 @@ public class HttpURI
                             break;
                             
                         case '@':
-                            _user=uri.substring(mark,i);
-                            mark=i+1;
-                            break;
-                            
                         case ';':
                         case '?':
                         case '#':

jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java

@@ -98,6 +98,13 @@ public class HttpURIParseTest
         
         // Path with query alt syntax
         {"/path/info?a=;query",null,null,null,"/path/info",null,"a=;query",null},
+
+        // URI with host character
+        {"/@path/info",null,null,null,"/@path/info",null,null,null},
+        {"/user@path/info",null,null,null,"/user@path/info",null,null,null},
+        {"//user@host/info",null,"host",null,"/info",null,null,null},
+        {"//@host/info",null,"host",null,"/info",null,null,null},
+        {"@host/info",null,null,null,"@host/info",null,null,null},
         
         // Scheme-less, with host and port (overlapping with path)
         {"//host:8080//",null,"host","8080","//",null,null,null},

jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java

@@ -92,7 +92,13 @@ public class HttpURITest
             assertEquals(value,parameters.getString("value"));
         }
     }
-    
+
+    @Test
+    public void testAt() throws Exception
+    {
+        HttpURI uri = new HttpURI("/@foo/bar");
+        assertEquals("/@foo/bar",uri.getPath());
+    }
 
     @Test
     public void testParams() throws Exception