@@ -2009,24 +2009,20 @@ public boolean doHandle(final FilterChainContext ctx,
2009
2009
final byte [] data = request .getByteData ();
2010
2010
final Buffer gBuffer = Buffers .wrap (mm , data );
2011
2011
if (requestPacket .getContentLength () == -1 ) {
2012
- if (! clientConfig . isCompressionEnabled ()) {
2013
- requestPacket . setContentLengthLong ( data . length );
2014
- }
2015
- }
2016
- final HttpContent content = requestPacket . httpContentBuilder (). content ( gBuffer ). build ();
2017
- content . setLast ( true );
2012
+ requestPacket . setContentLengthLong ( data . length );
2013
+ }
2014
+ final HttpContent content = requestPacket . httpContentBuilder ()
2015
+ . content ( gBuffer )
2016
+ . last ( true )
2017
+ . build ( );
2018
2018
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
2019
2019
return true ;
2020
2020
}
2021
2021
2022
2022
@ Override
2023
2023
protected long getContentLength (final Request request ) {
2024
- if (request .getContentLength () >= 0 ) {
2025
- return request .getContentLength ();
2026
- }
2027
-
2028
- return clientConfig .isCompressionEnabled ()
2029
- ? -1
2024
+ return request .getContentLength () >= 0
2025
+ ? request .getContentLength ()
2030
2026
: request .getByteData ().length ;
2031
2027
}
2032
2028
}
@@ -2056,12 +2052,12 @@ public boolean doHandle(final FilterChainContext ctx,
2056
2052
final MemoryManager mm = ctx .getMemoryManager ();
2057
2053
final Buffer gBuffer = Buffers .wrap (mm , data );
2058
2054
if (requestPacket .getContentLength () == -1 ) {
2059
- if (!clientConfig .isCompressionEnabled ()) {
2060
- requestPacket .setContentLengthLong (data .length );
2061
- }
2055
+ requestPacket .setContentLengthLong (data .length );
2062
2056
}
2063
- final HttpContent content = requestPacket .httpContentBuilder ().content (gBuffer ).build ();
2064
- content .setLast (true );
2057
+ final HttpContent content = requestPacket .httpContentBuilder ()
2058
+ .content (gBuffer )
2059
+ .last (true )
2060
+ .build ();
2065
2061
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
2066
2062
return true ;
2067
2063
}
@@ -2116,13 +2112,13 @@ public boolean doHandle(final FilterChainContext ctx,
2116
2112
final byte [] data = sb .toString ().getBytes (charset );
2117
2113
final MemoryManager mm = ctx .getMemoryManager ();
2118
2114
final Buffer gBuffer = Buffers .wrap (mm , data );
2119
- final HttpContent content = requestPacket .httpContentBuilder ().content (gBuffer ).build ();
2115
+ final HttpContent content = requestPacket .httpContentBuilder ()
2116
+ .content (gBuffer )
2117
+ .last (true )
2118
+ .build ();
2120
2119
if (requestPacket .getContentLength () == -1 ) {
2121
- if (!clientConfig .isCompressionEnabled ()) {
2122
- requestPacket .setContentLengthLong (data .length );
2123
- }
2120
+ requestPacket .setContentLengthLong (data .length );
2124
2121
}
2125
- content .setLast (true );
2126
2122
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
2127
2123
}
2128
2124
return true ;
@@ -2154,8 +2150,10 @@ public boolean doHandle(final FilterChainContext ctx,
2154
2150
b = o .getBuffer ();
2155
2151
b .trim ();
2156
2152
if (b .hasRemaining ()) {
2157
- final HttpContent content = requestPacket .httpContentBuilder ().content (b ).build ();
2158
- content .setLast (true );
2153
+ final HttpContent content = requestPacket .httpContentBuilder ()
2154
+ .content (b )
2155
+ .last (true )
2156
+ .build ();
2159
2157
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
2160
2158
}
2161
2159
@@ -2204,9 +2202,11 @@ public boolean doHandle(final FilterChainContext ctx,
2204
2202
}
2205
2203
buffer .trim ();
2206
2204
if (buffer .hasRemaining ()) {
2207
- final HttpContent content = requestPacket .httpContentBuilder ().content (buffer ).build ();
2205
+ final HttpContent content = requestPacket .httpContentBuilder ()
2206
+ .content (buffer )
2207
+ .last (true )
2208
+ .build ();
2208
2209
buffer .allowBufferDispose (false );
2209
- content .setLast (true );
2210
2210
ctx .write (content , ((!requestPacket .isCommitted ()) ? ctx .getTransportContext ().getCompletionHandler () : null ));
2211
2211
}
2212
2212
@@ -2306,8 +2306,7 @@ public boolean doHandle(final FilterChainContext ctx,
2306
2306
final File f = request .getFile ();
2307
2307
requestPacket .setContentLengthLong (f .length ());
2308
2308
final HttpTransactionContext context = HttpTransactionContext .get (ctx .getConnection ());
2309
- if (clientConfig .isCompressionEnabled () || !SEND_FILE_SUPPORT ||
2310
- requestPacket .isSecure ()) {
2309
+ if (!SEND_FILE_SUPPORT || requestPacket .isSecure ()) {
2311
2310
2312
2311
final FileInputStream fis = new FileInputStream (request .getFile ());
2313
2312
final MemoryManager mm = ctx .getMemoryManager ();
@@ -2362,12 +2361,8 @@ public void updated(WriteResult result) {
2362
2361
2363
2362
@ Override
2364
2363
protected long getContentLength (final Request request ) {
2365
- if (request .getContentLength () >= 0 ) {
2366
- return request .getContentLength ();
2367
- }
2368
-
2369
- return clientConfig .isCompressionEnabled ()
2370
- ? -1
2364
+ return request .getContentLength () >= 0
2365
+ ? request .getContentLength ()
2371
2366
: request .getFile ().length ();
2372
2367
}
2373
2368
} // END FileBodyHandler
0 commit comments