@@ -337,16 +337,11 @@ impl Endpoint {
337
337
http. enforce_http ( false ) ;
338
338
http. set_nodelay ( self . tcp_nodelay ) ;
339
339
http. set_keepalive ( self . tcp_keepalive ) ;
340
+ http. set_connect_timeout ( self . connect_timeout ) ;
340
341
341
342
let connector = self . connector ( http) ;
342
343
343
- if let Some ( connect_timeout) = self . connect_timeout {
344
- let mut connector = hyper_timeout:: TimeoutConnector :: new ( connector) ;
345
- connector. set_connect_timeout ( Some ( connect_timeout) ) ;
346
- Channel :: connect ( connector, self . clone ( ) ) . await
347
- } else {
348
- Channel :: connect ( connector, self . clone ( ) ) . await
349
- }
344
+ Channel :: connect ( connector, self . clone ( ) ) . await
350
345
}
351
346
352
347
/// Create a channel from this config.
@@ -358,16 +353,11 @@ impl Endpoint {
358
353
http. enforce_http ( false ) ;
359
354
http. set_nodelay ( self . tcp_nodelay ) ;
360
355
http. set_keepalive ( self . tcp_keepalive ) ;
356
+ http. set_connect_timeout ( self . connect_timeout ) ;
361
357
362
358
let connector = self . connector ( http) ;
363
359
364
- if let Some ( connect_timeout) = self . connect_timeout {
365
- let mut connector = hyper_timeout:: TimeoutConnector :: new ( connector) ;
366
- connector. set_connect_timeout ( Some ( connect_timeout) ) ;
367
- Channel :: new ( connector, self . clone ( ) )
368
- } else {
369
- Channel :: new ( connector, self . clone ( ) )
370
- }
360
+ Channel :: new ( connector, self . clone ( ) )
371
361
}
372
362
373
363
/// Connect with a custom connector.
0 commit comments