Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0452153

Browse files
author
oleksiys
committed
[1.8.x] + fix issueAsyncHttpClient#782
AsyncHttpClient#782"Query param are getting lost with Grizzly AHC"
1 parent71c3322 commit0452153

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

‎src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -888,19 +888,28 @@ private boolean sendAsGrizzlyRequest(final Request request,
888888
}
889889
finalProxyServerproxy =ProxyUtils.getProxyServer(config,request);
890890
finalbooleanuseProxy =proxy !=null;
891+
891892
if (useProxy) {
892-
if ((secure ||httpCtx.isWSRequest) && !httpCtx.isTunnelEstablished(connection)) {
893-
secure =false;
894-
httpCtx.establishingTunnel =true;
895-
builder.method(Method.CONNECT);
896-
builder.uri(AsyncHttpProviderUtils.getAuthority(uri));
897-
}elseif ((secure ||httpCtx.isWSRequest) &&config.isUseRelativeURIsWithConnectProxies()){
898-
builder.uri(uri.getRawPath());
893+
if (secure ||httpCtx.isWSRequest) {// TUNNELING?
894+
if (!httpCtx.isTunnelEstablished(connection)) {
895+
secure =false;
896+
httpCtx.establishingTunnel =true;
897+
builder.method(Method.CONNECT);
898+
builder.uri(AsyncHttpProviderUtils.getAuthority(uri));
899+
}else {
900+
if (config.isUseRelativeURIsWithConnectProxies()) {
901+
builder.uri(uri.getRawPath());
902+
builder.query(uri.getRawQuery());
903+
}else {
904+
builder.uri(uri.toString());
905+
}
906+
}
899907
}else {
900908
builder.uri(uri.toString());
901909
}
902910
}else {
903911
builder.uri(uri.getRawPath());
912+
builder.query(uri.getRawQuery());
904913
}
905914

906915
finalBodyHandlerbodyHandler =isPayloadAllowed(method) ?
@@ -936,10 +945,6 @@ private boolean sendAsGrizzlyRequest(final Request request,
936945

937946
ctx.notifyDownstream(newSwitchingSSLFilter.SSLSwitchingEvent(secure,connection));
938947

939-
if (!useProxy && !httpCtx.isWSRequest) {
940-
requestPacket.setQueryString(uri.getRawQuery());
941-
//addQueryString(request, requestPacket);
942-
}
943948
addHeaders(request,requestPacket);
944949
addCookies(request,requestPacket);
945950
addAuthorizationHeader(request,requestPacket);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp