From 8cba01cd277cf4c8c38b5fefd6296fc547afee65 Mon Sep 17 00:00:00 2001 From: Hiroaki Nakamura Date: Wed, 22 Jun 2022 12:49:42 +0900 Subject: [PATCH] Update xfwd type changed in nginx 1.23.0 --- ngx_http_geoip2_module.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ngx_http_geoip2_module.c b/ngx_http_geoip2_module.c index d27c94d..4b3461c 100644 --- a/ngx_http_geoip2_module.c +++ b/ngx_http_geoip2_module.c @@ -146,7 +146,11 @@ ngx_http_geoip2_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, MMDB_entry_data_s entry_data; ngx_http_geoip2_conf_t *gcf; ngx_addr_t addr; +#if defined(nginx_version) && nginx_version >= 1023000 + ngx_table_elt_t *xfwd; +#else ngx_array_t *xfwd; +#endif u_char *p; ngx_str_t val; @@ -169,9 +173,15 @@ ngx_http_geoip2_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, addr.sockaddr = r->connection->sockaddr; addr.socklen = r->connection->socklen; +#if defined(nginx_version) && nginx_version >= 1023000 + xfwd = r->headers_in.x_forwarded_for; + + if (xfwd != NULL && gcf->proxies != NULL) { +#else xfwd = &r->headers_in.x_forwarded_for; if (xfwd->nelts > 0 && gcf->proxies != NULL) { +#endif (void) ngx_http_get_forwarded_addr(r, &addr, xfwd, NULL, gcf->proxies, gcf->proxy_recursive); }