From 3cd6817e219aeeb27c0a3a5147bdd4f137ebcab6 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 29 Oct 2017 16:54:21 +0900 Subject: [PATCH] Fix typos --- doc/nghttpx.h2r | 6 +++--- src/shrpx.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/nghttpx.h2r b/doc/nghttpx.h2r index f2b7abca..86bf80e0 100644 --- a/doc/nghttpx.h2r +++ b/doc/nghttpx.h2r @@ -49,7 +49,7 @@ Error log (:) - It is a conbination of date and time when the log is written. It + It is a combination of date and time when the log is written. It is in ISO 8601 format. @@ -200,7 +200,7 @@ By default, session ID is shared by all worker threads. If :option:`--tls-session-cache-memcached` is given, nghttpx will insert serialized session data to memcached with -``nghttpx:tls-session-cache:`` + lowercased hex string of session ID +``nghttpx:tls-session-cache:`` + lowercase hex string of session ID as a memcached entry key, with expiry time 12 hours. Session timeout is set to 12 hours. @@ -612,7 +612,7 @@ The replacement is done instantly without breaking existing connections or requests. It also avoids any process creation as is the case with hot swapping with signals. -The one limitation is that only numeric IP address is allowd in +The one limitation is that only numeric IP address is allowed in :option:`backend <--backend>` in request body unless "dns" parameter is used while non numeric hostname is allowed in command-line or configuration file is read using :option:`--conf`. diff --git a/src/shrpx.cc b/src/shrpx.cc index f8a8f364..cc5bfd5b 100644 --- a/src/shrpx.cc +++ b/src/shrpx.cc @@ -1667,7 +1667,7 @@ Connections: "/", it performs exact match against the request path. If host is given, it performs a match against the request host. For a request received on the frontend - lister with "sni-fwd" parameter enabled, SNI host is + listener with "sni-fwd" parameter enabled, SNI host is used instead of a request host. If host alone is given, "/" is appended to it, so that it matches all request paths under the host (e.g., specifying "nghttp2.org"