Skip to content

Commit c33be00

Browse files
author
oleksiys
committed
[master] improve compression enabling logic
1 parent 97de1e5 commit c33be00

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/GrizzlyAsyncHttpProvider.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,10 @@ public void onTimeout(Connection connection) {
298298
eventFilter.removeContentEncoding(encoding);
299299
}
300300
}
301-
if (clientConfig.isCompressionEnforced()) {
302-
eventFilter.addContentEncoding(new GZipContentEncoding(512, 512, new ClientEncodingFilter()));
303-
}
301+
302+
eventFilter.addContentEncoding(new GZipContentEncoding(512, 512,
303+
new ClientEncodingFilter()));
304+
304305
secure.add(eventFilter);
305306
final AsyncHttpClientFilter clientFilter = new AsyncHttpClientFilter(this, clientConfig);
306307
secure.add(clientFilter);

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/AsyncHttpClientFilter.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,11 @@ private void addGeneralHeaders(final Request request, final HttpRequestPacket re
513513
if (!headers.contains(Header.UserAgent)) {
514514
requestPacket.addHeader(Header.UserAgent, config.getUserAgent());
515515
}
516+
517+
if (config.isCompressionEnforced() &&
518+
!headers.contains(Header.AcceptEncoding)) {
519+
requestPacket.addHeader(Header.AcceptEncoding, "gzip");
520+
}
516521
}
517522

518523
private void addCookies(final Request request, final HttpRequestPacket requestPacket) {

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/filters/ClientEncodingFilter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013 Sonatype, Inc. All rights reserved.
2+
* Copyright (c) 2013-2014 Sonatype, Inc. All rights reserved.
33
*
44
* This program is licensed to you under the Apache License Version 2.0,
55
* and you may not use this file except in compliance with the Apache License Version 2.0.
@@ -30,7 +30,6 @@ public final class ClientEncodingFilter implements EncodingFilter {
3030
// --------------------------------------------- Methods from EncodingFilter
3131

3232
public boolean applyEncoding(HttpHeader httpPacket) {
33-
httpPacket.addHeader(Header.AcceptEncoding, "gzip");
3433
return false;
3534
}
3635

0 commit comments

Comments
 (0)