unused vars

Author: shreemaan-abhishek

patch/1.27.1.1/ngx_lua-enable_keepalive.patch

@@ -1,5 +1,5 @@
 diff --git src/ngx_http_lua_balancer.c src/ngx_http_lua_balancer.c
-index ae0f1380..1d3fcb74 100644
+index ae0f1380..a51532da 100644
 --- src/ngx_http_lua_balancer.c
 +++ src/ngx_http_lua_balancer.c
 @@ -31,10 +31,39 @@ typedef struct {
@@ -143,9 +143,13 @@ index ae0f1380..1d3fcb74 100644
 
          lscf->balancer.original_init_upstream = uscf->peer.init_upstream;
 
-@@ -290,12 +328,9 @@ ngx_http_lua_balancer_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
-     ngx_uint_t                            bucket_cnt;
-     ngx_queue_t                          *buckets;
+@@ -286,16 +324,10 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+ static ngx_int_t
+ ngx_http_lua_balancer_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+ {
+-    ngx_uint_t                            i;
+-    ngx_uint_t                            bucket_cnt;
+-    ngx_queue_t                          *buckets;
      ngx_http_lua_srv_conf_t              *lscf;
 -    ngx_http_lua_balancer_ka_item_t      *cached;
 
@@ -156,7 +160,7 @@ index ae0f1380..1d3fcb74 100644
      if (lscf->balancer.original_init_upstream(cf, us) != NGX_OK) {
          return NGX_ERROR;
      }
-@@ -304,38 +339,6 @@ ngx_http_lua_balancer_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+@@ -304,38 +336,6 @@ ngx_http_lua_balancer_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
 
      us->peer.init = ngx_http_lua_balancer_init_peer;
 
@@ -195,23 +199,23 @@ index ae0f1380..1d3fcb74 100644
      return NGX_OK;
  }
 
-@@ -387,6 +390,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -387,6 +387,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
      void                               *pdata;
      lua_State                          *L;
      ngx_int_t                           rc;
 +    ngx_queue_t                        *q;
      ngx_connection_t                   *c;
      ngx_http_request_t                 *r;
  #if (NGX_HTTP_SSL)
-@@ -394,6 +398,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -394,6 +395,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
  #endif
      ngx_http_lua_ctx_t                 *ctx;
      ngx_http_lua_srv_conf_t            *lscf;
 +    ngx_http_lua_balancer_keepalive_item_t *item;
      ngx_http_lua_balancer_peer_data_t  *bp = data;
 
      ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
-@@ -425,9 +430,12 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -425,9 +427,12 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
 
      ctx->context = NGX_HTTP_LUA_CONTEXT_BALANCER;
 
@@ -224,7 +228,7 @@ index ae0f1380..1d3fcb74 100644
      bp->keepalive_requests = 0;
      bp->keepalive_timeout = 0;
      bp->keepalive = 0;
-@@ -465,10 +473,10 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -465,10 +470,10 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
          pc->local = bp->local;
      }
 
@@ -237,7 +241,7 @@ index ae0f1380..1d3fcb74 100644
          pc->cached = 0;
          pc->connection = NULL;
 
-@@ -476,27 +484,59 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -476,27 +481,59 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
              r->upstream->peer.tries += bp->more_tries;
          }
 
@@ -310,7 +314,7 @@ index ae0f1380..1d3fcb74 100644
          }
 
          return NGX_OK;
-@@ -577,14 +617,12 @@ static void
+@@ -577,14 +614,12 @@ static void
  ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
      ngx_uint_t state)
  {
@@ -327,7 +331,7 @@ index ae0f1380..1d3fcb74 100644
 
      ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                     "lua balancer: free peer, tries: %ui", pc->tries);
-@@ -592,14 +630,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -592,14 +627,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
      u = bp->request->upstream;
      c = pc->connection;
 
@@ -346,7 +350,7 @@ index ae0f1380..1d3fcb74 100644
              if (state & NGX_PEER_FAILED
                  || c == NULL
                  || c->read->eof
-@@ -633,42 +673,41 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -633,42 +670,41 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
                  goto invalid;
              }
 
@@ -408,7 +412,7 @@ index ae0f1380..1d3fcb74 100644
 
              if (c->write->timer_set) {
                  ngx_del_timer(c->write);
-@@ -684,42 +723,6 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -684,42 +720,6 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
              c->write->log = ngx_cycle->log;
              c->pool->log = ngx_cycle->log;
 
@@ -451,7 +455,7 @@ index ae0f1380..1d3fcb74 100644
              if (c->read->ready) {
                  ngx_http_lua_balancer_close_handler(c->read);
              }
-@@ -728,9 +731,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -728,9 +728,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
 
  invalid:
 
@@ -471,7 +475,7 @@ index ae0f1380..1d3fcb74 100644
          }
 
          return;
-@@ -740,6 +750,123 @@ invalid:
+@@ -740,6 +747,123 @@ invalid:
  }
 
 
@@ -595,7 +599,7 @@ index ae0f1380..1d3fcb74 100644
  static void
  ngx_http_lua_balancer_notify_peer(ngx_peer_connection_t *pc, void *data,
      ngx_uint_t type)
-@@ -755,6 +882,10 @@ ngx_http_lua_balancer_notify_peer(ngx_peer_connection_t *pc, void *data,
+@@ -755,6 +879,10 @@ ngx_http_lua_balancer_notify_peer(ngx_peer_connection_t *pc, void *data,
  static void
  ngx_http_lua_balancer_close(ngx_connection_t *c)
  {
@@ -606,7 +610,7 @@ index ae0f1380..1d3fcb74 100644
  #if (NGX_HTTP_SSL)
      if (c->ssl) {
          c->ssl->no_wait_shutdown = 1;
-@@ -762,9 +893,6 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
+@@ -762,9 +890,6 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
 
          if (ngx_ssl_shutdown(c) == NGX_AGAIN) {
              c->ssl->handler = ngx_http_lua_balancer_close;
@@ -616,7 +620,7 @@ index ae0f1380..1d3fcb74 100644
              return;
          }
      }
-@@ -773,8 +901,12 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
+@@ -773,8 +898,12 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
      ngx_destroy_pool(c->pool);
      ngx_close_connection(c);
 
@@ -631,7 +635,7 @@ index ae0f1380..1d3fcb74 100644
  }
 
 
-@@ -789,7 +921,7 @@ ngx_http_lua_balancer_dummy_handler(ngx_event_t *ev)
+@@ -789,7 +918,7 @@ ngx_http_lua_balancer_dummy_handler(ngx_event_t *ev)
  static void
  ngx_http_lua_balancer_close_handler(ngx_event_t *ev)
  {
@@ -640,7 +644,7 @@ index ae0f1380..1d3fcb74 100644
 
      int                n;
      char               buf[1];
-@@ -820,8 +952,10 @@ close:
+@@ -820,8 +949,10 @@ close:
      ngx_http_lua_balancer_close(c);
 
      ngx_queue_remove(&item->queue);
@@ -653,7 +657,7 @@ index ae0f1380..1d3fcb74 100644
  }
 
 
-@@ -832,7 +966,7 @@ ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc, void *data)
+@@ -832,7 +963,7 @@ ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc, void *data)
  {
      ngx_http_lua_balancer_peer_data_t  *bp = data;
 
@@ -662,7 +666,7 @@ index ae0f1380..1d3fcb74 100644
          /* TODO */
          return NGX_OK;
      }
-@@ -846,7 +980,7 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
+@@ -846,7 +977,7 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
  {
      ngx_http_lua_balancer_peer_data_t  *bp = data;
 
@@ -671,7 +675,7 @@ index ae0f1380..1d3fcb74 100644
          /* TODO */
          return;
      }
-@@ -859,9 +993,8 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
+@@ -859,9 +990,8 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
 
  int
  ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
@@ -683,7 +687,7 @@ index ae0f1380..1d3fcb74 100644
  {
      ngx_url_t              url;
      ngx_http_lua_ctx_t    *ctx;
-@@ -920,32 +1053,15 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
+@@ -920,32 +1050,15 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
      if (url.addrs && url.addrs[0].sockaddr) {
          bp->sockaddr = url.addrs[0].sockaddr;
          bp->socklen = url.addrs[0].socklen;
@@ -719,7 +723,7 @@ index ae0f1380..1d3fcb74 100644
 
      return NGX_OK;
  }
-@@ -1050,11 +1166,15 @@ ngx_http_lua_ffi_balancer_enable_keepalive(ngx_http_request_t *r,
+@@ -1050,11 +1163,15 @@ ngx_http_lua_ffi_balancer_enable_keepalive(ngx_http_request_t *r,
 
      bp = (ngx_http_lua_balancer_peer_data_t *) u->peer.data;
 
@@ -736,7 +740,7 @@ index ae0f1380..1d3fcb74 100644
      bp->keepalive_timeout = (ngx_msec_t) timeout;
      bp->keepalive_requests = (ngx_uint_t) max_requests;
      bp->keepalive = 1;
-@@ -1375,138 +1495,4 @@ ngx_http_lua_balancer_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+@@ -1375,138 +1492,4 @@ ngx_http_lua_balancer_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
      return NGX_CONF_OK;
  }