Skip to content

Commit 90c5060

Browse files
authored
Merge pull request #18 from luborjurena/master
Added compatibility for nginx >=1.23.0
2 parents 931599f + 36b7622 commit 90c5060

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

ngx_http_ip2proxy.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,16 +236,27 @@ ngx_http_ip2proxy_get_records(ngx_http_request_t *r)
236236

237237
if (gcf->handler) {
238238
ngx_addr_t addr;
239-
ngx_array_t *xfwd;
239+
240+
#if defined(nginx_version) && nginx_version >= 1023000
241+
ngx_table_elt_t *xfwd;
242+
#else
243+
ngx_array_t *xfwd;
244+
#endif
240245
u_char p[NGX_INET6_ADDRSTRLEN + 1];
241246
size_t size;
242247

243248
addr.sockaddr = r->connection->sockaddr;
244249
addr.socklen = r->connection->socklen;
245250

246-
xfwd = &r->headers_in.x_forwarded_for;
251+
#if defined(nginx_version) && nginx_version >= 1023000
252+
xfwd = r->headers_in.x_forwarded_for;
253+
254+
if (xfwd != NULL && gcf->proxies != NULL) {
255+
#else
256+
xfwd = &r->headers_in.x_forwarded_for;
247257

248-
if (xfwd->nelts > 0 && gcf->proxies != NULL) {
258+
if (xfwd->nelts > 0 && gcf->proxies != NULL) {
259+
#endif
249260
(void) ngx_http_get_forwarded_addr(r, &addr, xfwd, NULL, gcf->proxies, gcf->proxy_recursive);
250261
}
251262

0 commit comments

Comments
 (0)