Merge branch 'master' into http2-debug-state-api

This commit is contained in:
Tatsuhiro Tsujikawa
2016-08-26 22:54:59 +09:00
27 changed files with 173 additions and 54 deletions

View File

@@ -37,6 +37,7 @@ APIDOCS= \
nghttp2_hd_deflate_get_num_table_entries.rst \
nghttp2_hd_deflate_get_table_entry.rst \
nghttp2_hd_deflate_hd.rst \
nghttp2_hd_deflate_hd_vec.rst \
nghttp2_hd_deflate_new.rst \
nghttp2_hd_deflate_new2.rst \
nghttp2_hd_inflate_change_table_size.rst \

View File

@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "H2LOAD" "1" "Jul 31, 2016" "1.14.0-DEV" "nghttp2"
.TH "H2LOAD" "1" "Aug 25, 2016" "1.14.0" "nghttp2"
.SH NAME
h2load \- HTTP/2 benchmarking tool
.

View File

@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "NGHTTP" "1" "Jul 31, 2016" "1.14.0-DEV" "nghttp2"
.TH "NGHTTP" "1" "Aug 25, 2016" "1.14.0" "nghttp2"
.SH NAME
nghttp \- HTTP/2 client
.

View File

@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "NGHTTPD" "1" "Jul 31, 2016" "1.14.0-DEV" "nghttp2"
.TH "NGHTTPD" "1" "Aug 25, 2016" "1.14.0" "nghttp2"
.SH NAME
nghttpd \- HTTP/2 server
.

View File

@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "NGHTTPX" "1" "Jul 31, 2016" "1.14.0-DEV" "nghttp2"
.TH "NGHTTPX" "1" "Aug 25, 2016" "1.14.0" "nghttp2"
.SH NAME
nghttpx \- HTTP/2 proxy
.
@@ -938,6 +938,12 @@ $ssl_session_id: session ID for SSL/TLS connection.
.IP \(bu 2
$ssl_session_reused: "r" if SSL/TLS session was
reused. Otherwise, "."
.IP \(bu 2
$backend_host: backend host used to fulfill the
request. "\-" if backend host is not available.
.IP \(bu 2
$backend_port: backend port used to fulfill the
request. "\-" if backend host is not available.
.UNINDENT
.sp
The variable can be enclosed by "{" and "}" for

View File

@@ -847,6 +847,10 @@ Logging
* $ssl_session_id: session ID for SSL/TLS connection.
* $ssl_session_reused: "r" if SSL/TLS session was
reused. Otherwise, "."
* $backend_host: backend host used to fulfill the
request. "-" if backend host is not available.
* $backend_port: backend port used to fulfill the
request. "-" if backend host is not available.
The variable can be enclosed by "{" and "}" for
disambiguation (e.g., ${remote_addr}).