Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7430

Browse Source
This commit is contained in:
Hakase
2018-12-15 16:16:16 +09:00
parent e68a8ff05c
commit b4248b3bc5
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/modules/ngx_http_geo_module.c
+13
View File
@@ -215,6 +215,13 @@ ngx_http_geo_cidr_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
break; break;
#endif #endif
#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:
vv = (ngx_http_variable_value_t *)
ngx_radix32tree_find(ctx->u.trees.tree, INADDR_NONE);
break;
#endif
default: /* AF_INET */ default: /* AF_INET */
sin = (struct sockaddr_in *) addr.sockaddr; sin = (struct sockaddr_in *) addr.sockaddr;
inaddr = ntohl(sin->sin_addr.s_addr); inaddr = ntohl(sin->sin_addr.s_addr);
@@ -277,6 +284,12 @@ ngx_http_geo_range_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
break; break;
#endif #endif
#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:
inaddr = INADDR_NONE;
break;
#endif
default: /* AF_INET */ default: /* AF_INET */
sin = (struct sockaddr_in *) addr.sockaddr; sin = (struct sockaddr_in *) addr.sockaddr;
inaddr = ntohl(sin->sin_addr.s_addr); inaddr = ntohl(sin->sin_addr.s_addr);
src/stream/ngx_stream_geo_module.c
+13
View File
@@ -206,6 +206,13 @@ ngx_stream_geo_cidr_variable(ngx_stream_session_t *s,
break; break;
#endif #endif
#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:
vv = (ngx_stream_variable_value_t *)
ngx_radix32tree_find(ctx->u.trees.tree, INADDR_NONE);
break;
#endif
default: /* AF_INET */ default: /* AF_INET */
sin = (struct sockaddr_in *) addr.sockaddr; sin = (struct sockaddr_in *) addr.sockaddr;
inaddr = ntohl(sin->sin_addr.s_addr); inaddr = ntohl(sin->sin_addr.s_addr);
@@ -268,6 +275,12 @@ ngx_stream_geo_range_variable(ngx_stream_session_t *s,
break; break;
#endif #endif
#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:
inaddr = INADDR_NONE;
break;
#endif
default: /* AF_INET */ default: /* AF_INET */
sin = (struct sockaddr_in *) addr.sockaddr; sin = (struct sockaddr_in *) addr.sockaddr;
inaddr = ntohl(sin->sin_addr.s_addr); inaddr = ntohl(sin->sin_addr.s_addr);