Update man pages

Bump up version number to 1.11.1
nghttpx: Fix bug that timeout on h1 backend makes that backend unavailable
2016-05-29 23:51:37 +09:00 · 2016-05-29 23:44:59 +09:00 · 2016-05-29 23:43:31 +09:00
7 changed files with 10 additions and 8 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -24,7 +24,7 @@
 cmake_minimum_required(VERSION 3.0)
 # XXX using 1.8.90 instead of 1.9.0-DEV
-project(nghttp2 VERSION 1.11.0)
+project(nghttp2 VERSION 1.11.1)
 # See versioning rule:
 #  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
--- a/configure.ac
+++ b/configure.ac
@ -25,7 +25,7 @@ dnl Do not change user variables!
 dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
 AC_PREREQ(2.61)
-AC_INIT([nghttp2], [1.11.0], [t-tujikawa@users.sourceforge.net])
+AC_INIT([nghttp2], [1.11.1], [t-tujikawa@users.sourceforge.net])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
--- a/doc/h2load.1
+++ b/doc/h2load.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "May 26, 2016" "1.11.0" "nghttp2"
+.TH "H2LOAD" "1" "May 29, 2016" "1.11.1" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
--- a/doc/nghttp.1
+++ b/doc/nghttp.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "May 26, 2016" "1.11.0" "nghttp2"
+.TH "NGHTTP" "1" "May 29, 2016" "1.11.1" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 client
 .
--- a/doc/nghttpd.1
+++ b/doc/nghttpd.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "May 26, 2016" "1.11.0" "nghttp2"
+.TH "NGHTTPD" "1" "May 29, 2016" "1.11.1" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 server
 .
--- a/doc/nghttpx.1
+++ b/doc/nghttpx.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "May 26, 2016" "1.11.0" "nghttp2"
+.TH "NGHTTPX" "1" "May 29, 2016" "1.11.1" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 proxy
 .
--- a/src/shrpx_http_downstream_connection.cc
+++ b/src/shrpx_http_downstream_connection.cc
@ -958,7 +958,8 @@ int HttpDownstreamConnection::tls_handshake() {
  connect_blocker->on_success();
-  conn_.timeoutcb = timeoutcb;
+  ev_set_cb(&conn_.rt, timeoutcb);
  ev_set_cb(&conn_.wt, timeoutcb);
  do_read_ = &HttpDownstreamConnection::read_tls;
  do_write_ = &HttpDownstreamConnection::write_tls;
@ -1137,7 +1138,8 @@ int HttpDownstreamConnection::connected() {
  connect_blocker->on_success();
-  conn_.timeoutcb = timeoutcb;
+  ev_set_cb(&conn_.rt, timeoutcb);
  ev_set_cb(&conn_.wt, timeoutcb);
  do_read_ = &HttpDownstreamConnection::read_clear;
  do_write_ = &HttpDownstreamConnection::write_clear;
Author	SHA1	Message	Date
Tatsuhiro Tsujikawa	7b71996d98	Update man pages	2016-05-29 23:51:37 +09:00
Tatsuhiro Tsujikawa	e92cc26792	Bump up version number to 1.11.1	2016-05-29 23:44:59 +09:00
Tatsuhiro Tsujikawa	82d9ffa1ad	nghttpx: Fix bug that timeout on h1 backend makes that backend unavailable	2016-05-29 23:43:31 +09:00