Skip to content

Commit b2209ed

Browse files
committed
getPort should work with uppercase scheme
Fixes AsyncHttpClient#1111
1 parent 4e4533c commit b2209ed

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/main/java/com/ning/http/util/AsyncHttpProviderUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public final static URI getRedirectUri(URI uri, String location) {
174174
public final static int getPort(URI uri) {
175175
int port = uri.getPort();
176176
if (port == -1)
177-
port = uri.getScheme().equals("http") || uri.getScheme().equals("ws") ? 80 : 443;
177+
port = uri.getScheme().equalsIgnoreCase("http") || uri.getScheme().equalsIgnoreCase("ws") ? 80 : 443;
178178
return port;
179179
}
180180

src/test/java/com/ning/http/util/AsyncHttpProviderUtilsTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,12 @@ public void getRedirectUriShouldHandleRelativeLocation() {
4242
URI uri = AsyncHttpProviderUtils.getRedirectUri(URI.create("http://www.ebay.de"), url);
4343
Assert.assertEquals("http://www.ebay.de/sch/sis.html;jsessionid=92D73F80262E3EBED7E115ED01035DDA?_nkw=FSC%20Lifebook%20E8310%20Core2Duo%20T8100%202%201GHz%204GB%20DVD%20RW&_itemId=150731406505", uri.toString());
4444
}
45-
}
45+
46+
@Test(groups = "fast")
47+
public void getPortShouldHandleAnyCaseScheme() {
48+
Assert.assertEquals(AsyncHttpProviderUtils.getPort(URI.create("HTTP://WWW.URI.COM")), 80);
49+
Assert.assertEquals(AsyncHttpProviderUtils.getPort(URI.create("http://www.uri.com")), 80);
50+
Assert.assertEquals(AsyncHttpProviderUtils.getPort(URI.create("HTTPS://WWW.URI.COM")), 443);
51+
Assert.assertEquals(AsyncHttpProviderUtils.getPort(URI.create("https://www.uri.com")), 443);
52+
}
53+
}

0 commit comments

Comments
 (0)