From: Ruslan Ermilov <ru@nginx.com>
Date: Thu, 8 Feb 2018 09:11:30 +0000 (+0300)
Subject: HTTP/2: fixed build with -Werror=unused-but-set-variable.
X-Git-Tag: release-1.13.9~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=09eb20c8a76c0c8e7c70d9e6415a5404589cba51;p=nginx.git

HTTP/2: fixed build with -Werror=unused-but-set-variable.
---

diff --git a/src/http/v2/ngx_http_v2_filter_module.c b/src/http/v2/ngx_http_v2_filter_module.c
index 6878c1d7f..980ea9271 100644
--- a/src/http/v2/ngx_http_v2_filter_module.c
+++ b/src/http/v2/ngx_http_v2_filter_module.c
@@ -688,18 +688,11 @@ ngx_http_v2_push_resources(ngx_http_request_t *r)
     ngx_str_t                   path, authority;
     ngx_uint_t                  i, push;
     ngx_table_elt_t           **h;
-    ngx_connection_t           *fc;
-    ngx_http_v2_stream_t       *stream;
     ngx_http_v2_loc_conf_t     *h2lcf;
-    ngx_http_v2_connection_t   *h2c;
     ngx_http_complex_value_t   *pushes;
 
-    fc = r->connection;
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0, "http2 push resources");
-
-    stream = r->stream;
-    h2c = stream->connection;
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "http2 push resources");
 
     ngx_str_null(&authority);
 
@@ -744,7 +737,7 @@ ngx_http_v2_push_resources(ngx_http_request_t *r)
 
     for (i = 0; i < r->headers_out.link.nelts; i++) {
 
-        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "http2 parse link: \"%V\"", &h[i]->value);
 
         start = h[i]->value.data;