Skip to content

Commit 9c08331

Browse files
committed
Fix host header, close AsyncHttpClient#906
1 parent b6e7574 commit 9c08331

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

api/src/main/java/org/asynchttpclient/util/AsyncHttpProviderUtils.java

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

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

providers/netty3/src/main/java/org/asynchttpclient/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))
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 {

providers/netty4/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactory.java

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

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

0 commit comments

Comments
 (0)