From 448652409ba5c3d89ab824e30edbfe6120aceffb Mon Sep 17 00:00:00 2001 From: Gustavo liberatti Date: Sun, 9 Jul 2023 12:29:10 -0400 Subject: [PATCH] Fixes >= NGINX 1.25.0 compatibility --- ngx_http_sticky_misc.c | 2 +- ngx_http_sticky_module.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ngx_http_sticky_misc.c b/ngx_http_sticky_misc.c index d1ee110..f32f931 100644 --- a/ngx_http_sticky_misc.c +++ b/ngx_http_sticky_misc.c @@ -20,8 +20,8 @@ #define MD5_CBLOCK 64 #define MD5_LBLOCK (MD5_CBLOCK/4) #define MD5_DIGEST_LENGTH 16 -#define SHA_CBLOCK 64 #define SHA_DIGEST_LENGTH 20 +#define SHA_CBLOCK 64 #ifndef SHA_DIGEST_LENGTH #define SHA_CBLOCK 64 diff --git a/ngx_http_sticky_module.c b/ngx_http_sticky_module.c index 3b94741..d791901 100644 --- a/ngx_http_sticky_module.c +++ b/ngx_http_sticky_module.c @@ -240,7 +240,7 @@ static ngx_int_t ngx_http_init_sticky_peer(ngx_http_request_t *r, ngx_http_upstr ngx_http_set_ctx(r, iphp, ngx_http_sticky_module); /* check weather a cookie is present or not and save it */ - if (ngx_http_parse_multi_header_lines(&r->headers_in.cookies, &iphp->sticky_conf->cookie_name, &route) != NGX_DECLINED) { + if (ngx_http_parse_multi_header_lines(r, r->headers_in.cookie,&iphp->sticky_conf->cookie_name, &route) != NULL) { /* a route cookie has been found. Let's give it a try */ ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "[sticky/init_sticky_peer] got cookie route=%V, let's try to find a matching peer", &route); @@ -472,7 +472,7 @@ static ngx_int_t ngx_http_sticky_header_filter(ngx_http_request_t *r) } if (ctx->sticky_conf->transfer_cookie) { - if (ngx_http_parse_set_cookie_lines(&r->upstream->headers_in.cookies, &ctx->sticky_conf->cookie_name, &transfer_cookie) == NGX_DECLINED) + if (ngx_http_parse_set_cookie_lines(r, r->upstream->headers_in.set_cookie,&ctx->sticky_conf->cookie_name, &transfer_cookie)== NULL) { ngx_str_null(&transfer_cookie); }