Skip to content

Commit f926279

Browse files
committed
Fix host header, close #906
1 parent 2f3755b commit f926279

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/main/java/com/ning/http/client/providers/netty/request/NettyRequestFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ else if (proxyServer != null && !(useProxyConnect(uri) && config.isUseRelativeUR
8585
private String hostHeader(Request request, Uri uri) {
8686
String host = request.getVirtualHost() != null ? request.getVirtualHost() : uri.getHost();
8787
int port = uri.getPort();
88-
return port == -1 || port == getDefaultPort(uri) ? host : host + ":" + port;
88+
return port == -1 || port == getSchemeDefaultPort(uri.getScheme()) ? host : host + ":" + port;
8989
}
9090

9191
public String firstRequestOnlyAuthorizationHeader(Request request, Uri uri, ProxyServer proxyServer, Realm realm) throws IOException {

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,14 @@ public final static boolean isSameHostAndProtocol(Uri uri1, Uri uri2) {
101101
&& getDefaultPort(uri1) == getDefaultPort(uri2);
102102
}
103103

104-
public final static int getDefaultPort(Uri uri) {
104+
public static final int getSchemeDefaultPort(String scheme) {
105+
return scheme.equals("http") || scheme.equals("ws") ? 80 : 443;
106+
}
107+
108+
public static final int getDefaultPort(Uri uri) {
105109
int port = uri.getPort();
106110
if (port == -1)
107-
port = uri.getScheme().equals("http") || uri.getScheme().equals("ws") ? 80 : 443;
111+
port = getSchemeDefaultPort(uri.getScheme());
108112
return port;
109113
}
110114

0 commit comments

Comments
 (0)