rm calc hash

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..3faa0269 100644
+index ae0f1380..3b4587f8 100644
 --- src/ngx_http_lua_balancer.c
 +++ src/ngx_http_lua_balancer.c
 @@ -31,10 +31,39 @@ typedef struct {
@@ -84,7 +84,7 @@ index ae0f1380..3faa0269 100644
  static ngx_int_t ngx_http_lua_balancer_init(ngx_conf_t *cf,
      ngx_http_upstream_srv_conf_t *us);
  static ngx_int_t ngx_http_lua_balancer_init_peer(ngx_http_request_t *r,
-@@ -87,17 +115,30 @@ static ngx_int_t ngx_http_lua_balancer_by_chunk(lua_State *L,
+@@ -87,17 +115,28 @@ static ngx_int_t ngx_http_lua_balancer_by_chunk(lua_State *L,
      ngx_http_request_t *r);
  static void ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc,
      void *data, ngx_uint_t state);
@@ -102,8 +102,8 @@ index ae0f1380..3faa0269 100644
  static void ngx_http_lua_balancer_close_handler(ngx_event_t *ev);
 -static ngx_connection_t *ngx_http_lua_balancer_get_cached_item(
 -    ngx_http_lua_srv_conf_t *lscf, ngx_peer_connection_t *pc, ngx_str_t *name);
- static ngx_uint_t ngx_http_lua_balancer_calc_hash(ngx_str_t *name,
-     struct sockaddr *sockaddr, socklen_t socklen, ngx_addr_t *local);
+-static ngx_uint_t ngx_http_lua_balancer_calc_hash(ngx_str_t *name,
+-    struct sockaddr *sockaddr, socklen_t socklen, ngx_addr_t *local);
 
 
 +#define ngx_http_lua_balancer_keepalive_is_enabled(bp)                       \
@@ -117,7 +117,7 @@ index ae0f1380..3faa0269 100644
  static struct sockaddr  *ngx_http_lua_balancer_default_server_sockaddr;
 
 
-@@ -181,7 +222,7 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+@@ -181,7 +220,7 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
 
      dd("enter");
 
@@ -126,15 +126,15 @@ index ae0f1380..3faa0269 100644
      if (cmd->post == NULL) {
          return NGX_CONF_ERROR;
      }
-@@ -246,6 +287,7 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+@@ -246,6 +285,7 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
          ngx_memzero(us, sizeof(ngx_http_upstream_server_t));
          ngx_memzero(&url, sizeof(ngx_url_t));
 
 +        /* just an invalid address as a place holder*/
          ngx_str_set(&url.url, "0.0.0.1");
          url.default_port = 80;
 
-@@ -261,8 +303,6 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
+@@ -261,8 +301,6 @@ ngx_http_lua_balancer_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
      }
 
      if (uscf->peer.init_upstream) {
@@ -143,7 +143,7 @@ index ae0f1380..3faa0269 100644
 
          lscf->balancer.original_init_upstream = uscf->peer.init_upstream;
 
-@@ -305,7 +345,7 @@ ngx_http_lua_balancer_init(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us)
+@@ -305,7 +343,7 @@ 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;
 
      /* allocate cache items and add to free queue */
@@ -152,23 +152,23 @@ index ae0f1380..3faa0269 100644
      cached = ngx_pcalloc(cf->pool,
                           sizeof(ngx_http_lua_balancer_ka_item_t)
                           * lscf->balancer.max_cached);
-@@ -387,6 +427,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -387,6 +425,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 +435,7 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -394,6 +433,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 +467,12 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -425,9 +465,12 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
 
      ctx->context = NGX_HTTP_LUA_CONTEXT_BALANCER;
 
@@ -181,7 +181,7 @@ index ae0f1380..3faa0269 100644
      bp->keepalive_requests = 0;
      bp->keepalive_timeout = 0;
      bp->keepalive = 0;
-@@ -465,10 +510,10 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -465,10 +508,10 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
          pc->local = bp->local;
      }
 
@@ -194,7 +194,7 @@ index ae0f1380..3faa0269 100644
          pc->cached = 0;
          pc->connection = NULL;
 
-@@ -476,27 +521,59 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
+@@ -476,27 +519,59 @@ ngx_http_lua_balancer_get_peer(ngx_peer_connection_t *pc, void *data)
              r->upstream->peer.tries += bp->more_tries;
          }
 
@@ -267,7 +267,7 @@ index ae0f1380..3faa0269 100644
          }
 
          return NGX_OK;
-@@ -577,14 +654,12 @@ static void
+@@ -577,14 +652,12 @@ static void
  ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
      ngx_uint_t state)
  {
@@ -284,7 +284,7 @@ index ae0f1380..3faa0269 100644
 
      ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                     "lua balancer: free peer, tries: %ui", pc->tries);
-@@ -592,14 +667,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -592,14 +665,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
      u = bp->request->upstream;
      c = pc->connection;
 
@@ -303,7 +303,7 @@ index ae0f1380..3faa0269 100644
              if (state & NGX_PEER_FAILED
                  || c == NULL
                  || c->read->eof
-@@ -633,42 +710,41 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -633,42 +708,41 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
                  goto invalid;
              }
 
@@ -365,7 +365,7 @@ index ae0f1380..3faa0269 100644
 
              if (c->write->timer_set) {
                  ngx_del_timer(c->write);
-@@ -684,42 +760,6 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -684,42 +758,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;
 
@@ -408,7 +408,7 @@ index ae0f1380..3faa0269 100644
              if (c->read->ready) {
                  ngx_http_lua_balancer_close_handler(c->read);
              }
-@@ -728,9 +768,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
+@@ -728,9 +766,16 @@ ngx_http_lua_balancer_free_peer(ngx_peer_connection_t *pc, void *data,
 
  invalid:
 
@@ -428,7 +428,7 @@ index ae0f1380..3faa0269 100644
          }
 
          return;
-@@ -740,6 +787,123 @@ invalid:
+@@ -740,6 +785,123 @@ invalid:
  }
 
 
@@ -552,7 +552,7 @@ index ae0f1380..3faa0269 100644
  static void
  ngx_http_lua_balancer_notify_peer(ngx_peer_connection_t *pc, void *data,
      ngx_uint_t type)
-@@ -755,6 +919,10 @@ ngx_http_lua_balancer_notify_peer(ngx_peer_connection_t *pc, void *data,
+@@ -755,6 +917,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)
  {
@@ -563,7 +563,7 @@ index ae0f1380..3faa0269 100644
  #if (NGX_HTTP_SSL)
      if (c->ssl) {
          c->ssl->no_wait_shutdown = 1;
-@@ -762,9 +930,6 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
+@@ -762,9 +928,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;
@@ -573,7 +573,7 @@ index ae0f1380..3faa0269 100644
              return;
          }
      }
-@@ -773,8 +938,12 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
+@@ -773,8 +936,12 @@ ngx_http_lua_balancer_close(ngx_connection_t *c)
      ngx_destroy_pool(c->pool);
      ngx_close_connection(c);
 
@@ -588,7 +588,7 @@ index ae0f1380..3faa0269 100644
  }
 
 
-@@ -789,7 +958,7 @@ ngx_http_lua_balancer_dummy_handler(ngx_event_t *ev)
+@@ -789,7 +956,7 @@ ngx_http_lua_balancer_dummy_handler(ngx_event_t *ev)
  static void
  ngx_http_lua_balancer_close_handler(ngx_event_t *ev)
  {
@@ -597,7 +597,7 @@ index ae0f1380..3faa0269 100644
 
      int                n;
      char               buf[1];
-@@ -820,8 +989,10 @@ close:
+@@ -820,8 +987,10 @@ close:
      ngx_http_lua_balancer_close(c);
 
      ngx_queue_remove(&item->queue);
@@ -610,7 +610,7 @@ index ae0f1380..3faa0269 100644
  }
 
 
-@@ -832,7 +1003,7 @@ ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc, void *data)
+@@ -832,7 +1001,7 @@ ngx_http_lua_balancer_set_session(ngx_peer_connection_t *pc, void *data)
  {
      ngx_http_lua_balancer_peer_data_t  *bp = data;
 
@@ -619,7 +619,7 @@ index ae0f1380..3faa0269 100644
          /* TODO */
          return NGX_OK;
      }
-@@ -846,7 +1017,7 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
+@@ -846,7 +1015,7 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
  {
      ngx_http_lua_balancer_peer_data_t  *bp = data;
 
@@ -628,7 +628,7 @@ index ae0f1380..3faa0269 100644
          /* TODO */
          return;
      }
-@@ -859,9 +1030,8 @@ ngx_http_lua_balancer_save_session(ngx_peer_connection_t *pc, void *data)
+@@ -859,9 +1028,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,
@@ -640,7 +640,7 @@ index ae0f1380..3faa0269 100644
  {
      ngx_url_t              url;
      ngx_http_lua_ctx_t    *ctx;
-@@ -920,32 +1090,15 @@ ngx_http_lua_ffi_balancer_set_current_peer(ngx_http_request_t *r,
+@@ -920,32 +1088,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;
@@ -676,7 +676,7 @@ index ae0f1380..3faa0269 100644
 
      return NGX_OK;
  }
-@@ -1050,11 +1203,15 @@ ngx_http_lua_ffi_balancer_enable_keepalive(ngx_http_request_t *r,
+@@ -1050,11 +1201,15 @@ ngx_http_lua_ffi_balancer_enable_keepalive(ngx_http_request_t *r,
 
      bp = (ngx_http_lua_balancer_peer_data_t *) u->peer.data;
 
@@ -693,10 +693,11 @@ index ae0f1380..3faa0269 100644
      bp->keepalive_timeout = (ngx_msec_t) timeout;
      bp->keepalive_requests = (ngx_uint_t) max_requests;
      bp->keepalive = 1;
-@@ -1376,58 +1533,6 @@ ngx_http_lua_balancer_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+@@ -1375,138 +1530,4 @@ ngx_http_lua_balancer_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+     return NGX_CONF_OK;
  }
 
- 
+-
 -#if (NGX_HTTP_SSL)
 -static ngx_int_t
 -ngx_http_lua_upstream_get_ssl_name(ngx_http_request_t *r,
@@ -749,13 +750,21 @@ index ae0f1380..3faa0269 100644
 -#endif
 -
 -
- static ngx_uint_t
- ngx_http_lua_balancer_calc_hash(ngx_str_t *name,
-     struct sockaddr *sockaddr, socklen_t socklen, ngx_addr_t *local)
-@@ -1443,70 +1548,4 @@ ngx_http_lua_balancer_calc_hash(ngx_str_t *name,
-     return hash;
- }
- 
+-static ngx_uint_t
+-ngx_http_lua_balancer_calc_hash(ngx_str_t *name,
+-    struct sockaddr *sockaddr, socklen_t socklen, ngx_addr_t *local)
+-{
+-    ngx_uint_t hash;
+-
+-    hash = ngx_hash_key_lc(name->data, name->len);
+-    hash ^= ngx_hash_key((u_char *) sockaddr, socklen);
+-    if (local != NULL) {
+-        hash ^= ngx_hash_key((u_char *) local->sockaddr, local->socklen);
+-    }
+-
+-    return hash;
+-}
+-
 -
 -static ngx_connection_t *
 -ngx_http_lua_balancer_get_cached_item(ngx_http_lua_srv_conf_t *lscf,