Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Greg Wilkins 2015-11-26 11:40:37 +11:00
parent ac124094dd ee9c57e3ea
commit 18a3af1951
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
View File

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

7
jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java
View File

@ -99,6 +99,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},

6
jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java
View File

@ -93,6 +93,12 @@ public class HttpURITest
}
}
@Test
public void testAt() throws Exception
{
HttpURI uri = new HttpURI("/@foo/bar");
assertEquals("/@foo/bar",uri.getPath());
}
@Test
public void testParams() throws Exception