@@ -266,63 +266,65 @@ public NettyRequest newNettyRequest(Request request, UriComponents uri, boolean
266
266
nettyRequest = new NettyRequest (httpRequest , body );
267
267
}
268
268
269
+ HttpHeaders headers = httpRequest .headers ();
270
+
269
271
if (method != HttpMethod .CONNECT ) {
270
272
// assign headers as configured on request
271
273
for (Entry <String , List <String >> header : request .getHeaders ()) {
272
- httpRequest . headers () .set (header .getKey (), header .getValue ());
274
+ headers .set (header .getKey (), header .getValue ());
273
275
}
274
276
275
277
if (isNonEmpty (request .getCookies ()))
276
- httpRequest . headers () .set (HttpHeaders .Names .COOKIE , CookieEncoder .encode (request .getCookies ()));
278
+ headers .set (HttpHeaders .Names .COOKIE , CookieEncoder .encode (request .getCookies ()));
277
279
278
280
if (config .isCompressionEnabled ())
279
- httpRequest . headers () .set (HttpHeaders .Names .ACCEPT_ENCODING , GZIP_DEFLATE );
281
+ headers .set (HttpHeaders .Names .ACCEPT_ENCODING , GZIP_DEFLATE );
280
282
}
281
283
282
284
if (body != null ) {
283
285
if (body .getContentLength () < 0 )
284
- httpRequest . headers () .set (HttpHeaders .Names .TRANSFER_ENCODING , HttpHeaders .Values .CHUNKED );
286
+ headers .set (HttpHeaders .Names .TRANSFER_ENCODING , HttpHeaders .Values .CHUNKED );
285
287
else
286
- httpRequest . headers () .set (HttpHeaders .Names .CONTENT_LENGTH , body .getContentLength ());
288
+ headers .set (HttpHeaders .Names .CONTENT_LENGTH , body .getContentLength ());
287
289
288
290
if (body .getContentType () != null )
289
- httpRequest . headers () .set (HttpHeaders .Names .CONTENT_TYPE , body .getContentType ());
291
+ headers .set (HttpHeaders .Names .CONTENT_TYPE , body .getContentType ());
290
292
}
291
293
292
294
// connection header and friends
293
295
boolean webSocket = isWebSocket (uri .getScheme ());
294
296
if (method != HttpMethod .CONNECT && webSocket ) {
295
- httpRequest . headers () .set (HttpHeaders .Names .UPGRADE , HttpHeaders .Values .WEBSOCKET );
296
- httpRequest . headers (). set (HttpHeaders .Names .CONNECTION , HttpHeaders .Values .UPGRADE );
297
- httpRequest . headers (). set (HttpHeaders .Names .ORIGIN , "http://" + uri .getHost () + ":" + (uri .getPort () == -1 ? isSecure (uri .getScheme ()) ? 443 : 80 : uri .getPort ()));
298
- httpRequest . headers (). set (HttpHeaders .Names .SEC_WEBSOCKET_KEY , getKey ());
299
- httpRequest . headers () .set (HttpHeaders .Names .SEC_WEBSOCKET_VERSION , "13" );
300
-
301
- } else if (!httpRequest . headers () .contains (HttpHeaders .Names .CONNECTION )) {
302
- httpRequest . headers () .set (HttpHeaders .Names .CONNECTION , keepAliveHeaderValue (config ));
297
+ headers .set (HttpHeaders .Names .UPGRADE , HttpHeaders .Values .WEBSOCKET )//
298
+ . set (HttpHeaders .Names .CONNECTION , HttpHeaders .Values .UPGRADE )//
299
+ . set (HttpHeaders .Names .ORIGIN , "http://" + uri .getHost () + ":" + (uri .getPort () == -1 ? isSecure (uri .getScheme ()) ? 443 : 80 : uri .getPort ()))//
300
+ . set (HttpHeaders .Names .SEC_WEBSOCKET_KEY , getKey ())//
301
+ .set (HttpHeaders .Names .SEC_WEBSOCKET_VERSION , "13" );
302
+
303
+ } else if (!headers .contains (HttpHeaders .Names .CONNECTION )) {
304
+ headers .set (HttpHeaders .Names .CONNECTION , keepAliveHeaderValue (config ));
303
305
}
304
306
305
307
String hostHeader = hostHeader (request , uri );
306
308
if (hostHeader != null )
307
- httpRequest . headers () .set (HttpHeaders .Names .HOST , hostHeader );
309
+ headers .set (HttpHeaders .Names .HOST , hostHeader );
308
310
309
311
Realm realm = request .getRealm () != null ? request .getRealm () : config .getRealm ();
310
312
String authorizationHeader = authorizationHeader (request , uri , proxyServer , realm );
311
313
if (authorizationHeader != null )
312
314
// don't override authorization but append
313
- httpRequest . headers () .add (HttpHeaders .Names .AUTHORIZATION , authorizationHeader );
315
+ headers .add (HttpHeaders .Names .AUTHORIZATION , authorizationHeader );
314
316
315
317
String proxyAuthorizationHeader = proxyAuthorizationHeader (request , proxyServer , method );
316
318
if (proxyAuthorizationHeader != null )
317
- httpRequest . headers () .set (HttpHeaders .Names .PROXY_AUTHORIZATION , proxyAuthorizationHeader );
319
+ headers .set (HttpHeaders .Names .PROXY_AUTHORIZATION , proxyAuthorizationHeader );
318
320
319
321
// Add default accept headers
320
- if (!httpRequest . headers () .contains (HttpHeaders .Names .ACCEPT ))
321
- httpRequest . headers () .set (HttpHeaders .Names .ACCEPT , "*/*" );
322
+ if (!headers .contains (HttpHeaders .Names .ACCEPT ))
323
+ headers .set (HttpHeaders .Names .ACCEPT , "*/*" );
322
324
323
325
// Add default user agent
324
- if (!httpRequest . headers () .contains (HttpHeaders .Names .USER_AGENT ) && config .getUserAgent () != null )
325
- httpRequest . headers () .set (HttpHeaders .Names .USER_AGENT , config .getUserAgent ());
326
+ if (!headers .contains (HttpHeaders .Names .USER_AGENT ) && config .getUserAgent () != null )
327
+ headers .set (HttpHeaders .Names .USER_AGENT , config .getUserAgent ());
326
328
327
329
return nettyRequest ;
328
330
}
0 commit comments