Skip to content

Commit fab52d1

Browse files
committed
Fix Host header is broken on virtual host, close AsyncHttpClient#907
1 parent 0df5740 commit fab52d1

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,15 @@ private static void encodeAndAppendFormParam(final StringBuilder sb, final CharS
174174
}
175175
sb.append('&');
176176
}
177+
178+
public static String hostHeader(Request request, Uri uri) {
179+
String virtualHost = request.getVirtualHost();
180+
if (virtualHost != null)
181+
return virtualHost;
182+
else {
183+
String host = uri.getHost();
184+
int port = uri.getPort();
185+
return port == -1 || port == getSchemeDefaultPort(uri.getScheme()) ? host : host + ":" + port;
186+
}
187+
}
177188
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ else if (proxyServer != null && !useProxyConnect(uri))
8282
}
8383
}
8484

85-
private String hostHeader(Request request, Uri uri) {
86-
String host = request.getVirtualHost() != null ? request.getVirtualHost() : uri.getHost();
87-
int port = uri.getPort();
88-
return port == -1 || port == getSchemeDefaultPort(uri.getScheme()) ? host : host + ":" + port;
89-
}
90-
9185
public String firstRequestOnlyAuthorizationHeader(Request request, Uri uri, ProxyServer proxyServer, Realm realm) throws IOException {
9286
String authorizationHeader = null;
9387

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@ else if (proxyServer != null && !useProxyConnect(uri))
8383
}
8484
}
8585

86-
private String hostHeader(Request request, Uri uri) {
87-
String host = request.getVirtualHost() != null ? request.getVirtualHost() : uri.getHost();
88-
int port = uri.getPort();
89-
return port == -1 || port == getSchemeDefaultPort(uri.getScheme()) ? host : host + ":" + port;
90-
}
91-
9286
public String firstRequestOnlyAuthorizationHeader(Request request, Uri uri, ProxyServer proxyServer, Realm realm) throws IOException {
9387
String authorizationHeader = null;
9488

0 commit comments

Comments
 (0)