@@ -1417,7 +1417,6 @@ protected boolean onHttpHeaderParsed(final HttpHeader httpHeader,
1417
1417
return false ;
1418
1418
}
1419
1419
1420
-
1421
1420
@ SuppressWarnings ({"unchecked" })
1422
1421
@ Override
1423
1422
protected boolean onHttpPacketParsed (HttpHeader httpHeader , FilterChainContext ctx ) {
@@ -1922,24 +1921,20 @@ public boolean doHandle(final FilterChainContext ctx,
1922
1921
final byte [] data = request .getByteData ();
1923
1922
final Buffer gBuffer = Buffers .wrap (mm , data );
1924
1923
if (requestPacket .getContentLength () == -1 ) {
1925
- if (!clientConfig .isCompressionEnforced ()) {
1926
- requestPacket .setContentLengthLong (data .length );
1927
- }
1924
+ requestPacket .setContentLengthLong (data .length );
1928
1925
}
1929
- final HttpContent content = requestPacket .httpContentBuilder ().content (gBuffer ).build ();
1930
- content .setLast (true );
1926
+ final HttpContent content = requestPacket .httpContentBuilder ()
1927
+ .content (gBuffer )
1928
+ .last (true )
1929
+ .build ();
1931
1930
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
1932
1931
return true ;
1933
1932
}
1934
1933
1935
1934
@ Override
1936
1935
protected long getContentLength (final Request request ) {
1937
- if (request .getContentLength () >= 0 ) {
1938
- return request .getContentLength ();
1939
- }
1940
-
1941
- return clientConfig .isCompressionEnforced ()
1942
- ? -1
1936
+ return request .getContentLength () >= 0
1937
+ ? request .getContentLength ()
1943
1938
: request .getByteData ().length ;
1944
1939
}
1945
1940
}
@@ -1969,12 +1964,12 @@ public boolean doHandle(final FilterChainContext ctx,
1969
1964
final MemoryManager mm = ctx .getMemoryManager ();
1970
1965
final Buffer gBuffer = Buffers .wrap (mm , data );
1971
1966
if (requestPacket .getContentLength () == -1 ) {
1972
- if (!clientConfig .isCompressionEnforced ()) {
1973
- requestPacket .setContentLengthLong (data .length );
1974
- }
1967
+ requestPacket .setContentLengthLong (data .length );
1975
1968
}
1976
- final HttpContent content = requestPacket .httpContentBuilder ().content (gBuffer ).build ();
1977
- content .setLast (true );
1969
+ final HttpContent content = requestPacket .httpContentBuilder ()
1970
+ .content (gBuffer )
1971
+ .last (true )
1972
+ .build ();
1978
1973
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
1979
1974
return true ;
1980
1975
}
@@ -2017,11 +2012,13 @@ public boolean doHandle(final FilterChainContext ctx,
2017
2012
final byte [] data = sb .toString ().getBytes (charset );
2018
2013
final MemoryManager mm = ctx .getMemoryManager ();
2019
2014
final Buffer gBuffer = Buffers .wrap (mm , data );
2020
- final HttpContent content = requestPacket .httpContentBuilder ().content (gBuffer ).build ();
2021
- if (requestPacket .getContentLength () == -1 && !clientConfig .isCompressionEnforced ()) {
2015
+ final HttpContent content = requestPacket .httpContentBuilder ()
2016
+ .content (gBuffer )
2017
+ .last (true )
2018
+ .build ();
2019
+ if (requestPacket .getContentLength () == -1 ) {
2022
2020
requestPacket .setContentLengthLong (data .length );
2023
2021
}
2024
- content .setLast (true );
2025
2022
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
2026
2023
}
2027
2024
@@ -2069,9 +2066,11 @@ public boolean doHandle(final FilterChainContext ctx,
2069
2066
}
2070
2067
buffer .trim ();
2071
2068
if (buffer .hasRemaining ()) {
2072
- final HttpContent content = requestPacket .httpContentBuilder ().content (buffer ).build ();
2069
+ final HttpContent content = requestPacket .httpContentBuilder ()
2070
+ .content (buffer )
2071
+ .last (true )
2072
+ .build ();
2073
2073
buffer .allowBufferDispose (false );
2074
- content .setLast (true );
2075
2074
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
2076
2075
}
2077
2076
@@ -2171,8 +2170,7 @@ public boolean doHandle(final FilterChainContext ctx,
2171
2170
final File f = request .getFile ();
2172
2171
requestPacket .setContentLengthLong (f .length ());
2173
2172
final HttpTransactionContext context = HttpTransactionContext .get (ctx .getConnection ());
2174
- if (clientConfig .isCompressionEnforced () || !SEND_FILE_SUPPORT ||
2175
- requestPacket .isSecure ()) {
2173
+ if (!SEND_FILE_SUPPORT || requestPacket .isSecure ()) {
2176
2174
2177
2175
final FileInputStream fis = new FileInputStream (request .getFile ());
2178
2176
final MemoryManager mm = ctx .getMemoryManager ();
@@ -2227,12 +2225,8 @@ public void updated(WriteResult result) {
2227
2225
2228
2226
@ Override
2229
2227
protected long getContentLength (final Request request ) {
2230
- if (request .getContentLength () >= 0 ) {
2231
- return request .getContentLength ();
2232
- }
2233
-
2234
- return clientConfig .isCompressionEnforced ()
2235
- ? -1
2228
+ return request .getContentLength () >= 0
2229
+ ? request .getContentLength ()
2236
2230
: request .getFile ().length ();
2237
2231
}
2238
2232
} // END FileBodyHandler
0 commit comments