From 0b2c139eaac5dc28088febe1f3701991fdbf05fd Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 25 Oct 2015 17:03:53 +0900 Subject: [PATCH] clang-format-3.5 --- src/shrpx.cc | 3 +-- src/shrpx_connection.cc | 2 +- src/shrpx_http_downstream_connection.cc | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/shrpx.cc b/src/shrpx.cc index 84723f6f..a56d9641 100644 --- a/src/shrpx.cc +++ b/src/shrpx.cc @@ -1434,8 +1434,7 @@ SSL/TLS: period. This behaviour applies to all TLS based frontends, and TLS HTTP/2 backends. Default: )" - << util::utos_with_unit(get_config()->tls_dyn_rec_warmup_threshold) - << R"( + << util::utos_with_unit(get_config()->tls_dyn_rec_warmup_threshold) << R"( --tls-dyn-rec-idle-timeout= Specify TLS dynamic record size behaviour timeout. See tls-dyn-rec-warmup-threshold for more information. This diff --git a/src/shrpx_connection.cc b/src/shrpx_connection.cc index 1ae49389..97d1e0af 100644 --- a/src/shrpx_connection.cc +++ b/src/shrpx_connection.cc @@ -500,7 +500,7 @@ const size_t SHRPX_SMALL_WRITE_LIMIT = 1300; size_t Connection::get_tls_write_limit() { if (tls_dyn_rec_warmup_threshold == 0) { - return std::numeric_limits::max(); + return std::numeric_limits::max(); } auto t = ev_now(loop); diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream_connection.cc index 12d0d005..b6e76907 100644 --- a/src/shrpx_http_downstream_connection.cc +++ b/src/shrpx_http_downstream_connection.cc @@ -114,8 +114,7 @@ HttpDownstreamConnection::HttpDownstreamConnection( : DownstreamConnection(dconn_pool), conn_(loop, -1, nullptr, nullptr, get_config()->downstream_write_timeout, get_config()->downstream_read_timeout, 0, 0, 0, 0, connectcb, - readcb, timeoutcb, this, - get_config()->tls_dyn_rec_warmup_threshold, + readcb, timeoutcb, this, get_config()->tls_dyn_rec_warmup_threshold, get_config()->tls_dyn_rec_idle_timeout), ioctrl_(&conn_.rlimit), response_htp_{0}, group_(group), addr_idx_(0), connected_(false) {}