From a390bd4ce0aa82a114a696bef3c6d12405ff0d04 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 19 Jan 2016 19:04:24 +0900
Subject: [PATCH] nghttpx: Fix compile error with --with-neverbleed

---
 src/shrpx_worker_process.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shrpx_worker_process.cc b/src/shrpx_worker_process.cc
index 61e44cb0..bf978b6c 100644
--- a/src/shrpx_worker_process.cc
+++ b/src/shrpx_worker_process.cc
@@ -398,8 +398,10 @@ int worker_process_event_loop(WorkerProcessConfig *wpconf) {
         make_unique<AcceptHandler>(wpconf->server_fd, &conn_handler));
   }
 
+  auto &upstreamconf = get_config()->conn.upstream;
+
 #ifdef HAVE_NEVERBLEED
-  if (!get_config()->upstream_no_tls || ssl::downstream_tls_enabled()) {
+  if (!upstreamconf.no_tls || ssl::downstream_tls_enabled()) {
     std::array<char, NEVERBLEED_ERRBUF_SIZE> errbuf;
     auto nb = make_unique<neverbleed_t>();
     if (neverbleed_init(nb.get(), errbuf.data()) != 0) {
@@ -423,8 +425,6 @@ int worker_process_event_loop(WorkerProcessConfig *wpconf) {
 
 #endif // HAVE_NEVERBLEED
 
-  auto &upstreamconf = get_config()->conn.upstream;
-
   ev_timer renew_ticket_key_timer;
   if (!upstreamconf.no_tls) {
     auto &ticketconf = get_config()->tls.ticket;