Commit4855d7a

committed

Merge pull requestAsyncHttpClient#1125 from jacobtolar/fix-scheme-case

getPort should work with uppercase scheme

2 parents4e4533c +b2209ed commit4855d7aCopy full SHA for 4855d7a

File tree

+10

-2

lines changed

src
- main/java/com/ning/http/util
  - AsyncHttpProviderUtils.java
- test/java/com/ning/http/util
  - AsyncHttpProviderUtilsTest.java

+10

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public final static URI getRedirectUri(URI uri, String location) {`
`174`	`174`	`publicfinalstaticintgetPort(URIuri) {`
`175`	`175`	`intport =uri.getPort();`
`176`	`176`	`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;`
`178`	`178`	`returnport;`
`179`	`179`	`}`
`180`	`180`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,12 @@ public void getRedirectUriShouldHandleRelativeLocation() {`
`42`	`42`	`URIuri =AsyncHttpProviderUtils.getRedirectUri(URI.create("http://www.ebay.de"),url);`
`43`	`43`	`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());`
`44`	`44`	`}`
`45`		`-}`
	`45`	`+`
	`46`	`+@Test(groups ="fast")`
	`47`	`+publicvoidgetPortShouldHandleAnyCaseScheme() {`
	`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`	`+}`

Comments

(0)