Compare commits

...

3 Commits

Author SHA1 Message Date
Tatsuhiro Tsujikawa
7ffc239b5f Bump up version number to 1.39.1 2019-06-11 23:20:14 +09:00
Tatsuhiro Tsujikawa
bc886a0e0d Fix FPE with default backend 2019-06-11 23:19:43 +09:00
Tatsuhiro Tsujikawa
a3a14a9cde Fix log-level is not set with cmd-line or configuration file 2019-06-11 23:19:43 +09:00
4 changed files with 6 additions and 4 deletions

View File

@@ -24,7 +24,7 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
# XXX using 1.8.90 instead of 1.9.0-DEV # XXX using 1.8.90 instead of 1.9.0-DEV
project(nghttp2 VERSION 1.39.0) project(nghttp2 VERSION 1.39.1)
# See versioning rule: # See versioning rule:
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html

View File

@@ -25,7 +25,7 @@ dnl Do not change user variables!
dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([nghttp2], [1.39.0], [t-tujikawa@users.sourceforge.net]) AC_INIT([nghttp2], [1.39.1], [t-tujikawa@users.sourceforge.net])
AC_CONFIG_AUX_DIR([.]) AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

View File

@@ -2898,6 +2898,8 @@ int process_options(Config *config,
assert(include_set.empty()); assert(include_set.empty());
} }
Log::set_severity_level(config->logging.severity);
auto &loggingconf = config->logging; auto &loggingconf = config->logging;
if (loggingconf.access.syslog || loggingconf.error.syslog) { if (loggingconf.access.syslog || loggingconf.error.syslog) {
@@ -3202,7 +3204,6 @@ void reload_config(WorkerProcess *wp) {
// configuration can be obtained from get_config(). // configuration can be obtained from get_config().
auto old_config = replace_config(std::move(new_config)); auto old_config = replace_config(std::move(new_config));
Log::set_severity_level(get_config()->logging.severity);
auto pid = fork_worker_process(ipc_fd, iaddrs); auto pid = fork_worker_process(ipc_fd, iaddrs);
@@ -3210,7 +3211,6 @@ void reload_config(WorkerProcess *wp) {
LOG(ERROR) << "Failed to process new configuration"; LOG(ERROR) << "Failed to process new configuration";
new_config = replace_config(std::move(old_config)); new_config = replace_config(std::move(old_config));
Log::set_severity_level(get_config()->logging.severity);
close_not_inherited_fd(new_config.get(), iaddrs); close_not_inherited_fd(new_config.get(), iaddrs);
return; return;

View File

@@ -3994,6 +3994,8 @@ int configure_downstream_group(Config *config, bool http2_proxy,
addr.host = StringRef::from_lit(DEFAULT_DOWNSTREAM_HOST); addr.host = StringRef::from_lit(DEFAULT_DOWNSTREAM_HOST);
addr.port = DEFAULT_DOWNSTREAM_PORT; addr.port = DEFAULT_DOWNSTREAM_PORT;
addr.proto = Proto::HTTP1; addr.proto = Proto::HTTP1;
addr.weight = 1;
addr.group_weight = 1;
DownstreamAddrGroupConfig g(StringRef::from_lit("/")); DownstreamAddrGroupConfig g(StringRef::from_lit("/"));
g.addrs.push_back(std::move(addr)); g.addrs.push_back(std::move(addr));