mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix "set_real_ip_from unix:" inheritance

Browse Source
This commit is contained in:
Igor Sysoev 2009-11-11 13:41:16 +00:00
parent 9eadbde324
commit 61da56d041
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/http/modules/ngx_http_realip_module.c
View File

@ -26,7 +26,7 @@ typedef struct {
ngx_uint_t hash; ngx_uint_t hash;
ngx_str_t header; ngx_str_t header;
#if (NGX_HAVE_UNIX_DOMAIN) #if (NGX_HAVE_UNIX_DOMAIN)
ngx_uint_t unixsock; /* unsigned unixsock:1; */ ngx_uint_t unixsock; /* unsigned unixsock:2; */
#endif #endif
} ngx_http_realip_loc_conf_t; } ngx_http_realip_loc_conf_t;
@ -411,10 +411,12 @@ ngx_http_realip_create_loc_conf(ngx_conf_t *cf)
* conf->from = NULL; * conf->from = NULL;
* conf->hash = 0; * conf->hash = 0;
* conf->header = { 0, NULL }; * conf->header = { 0, NULL };
* conf->unixsock = 0;
*/ */
conf->type = NGX_CONF_UNSET_UINT; conf->type = NGX_CONF_UNSET_UINT;
#if (NGX_HAVE_UNIX_DOMAIN)
conf->unixsock = 2;
#endif
return conf; return conf;
} }
@ -428,11 +430,14 @@ ngx_http_realip_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
if (conf->from == NULL) { if (conf->from == NULL) {
conf->from = prev->from; conf->from = prev->from;
#if (NGX_HAVE_UNIX_DOMAIN)
conf->unixsock = prev->unixsock;
#endif
} }
#if (NGX_HAVE_UNIX_DOMAIN)
if (conf->unixsock == 2) {
conf->unixsock = (prev->unixsock == 2) ? 0 : prev->unixsock;
}
#endif
ngx_conf_merge_uint_value(conf->type, prev->type, NGX_HTTP_REALIP_XREALIP); ngx_conf_merge_uint_value(conf->type, prev->type, NGX_HTTP_REALIP_XREALIP);
if (conf->header.len == 0) { if (conf->header.len == 0) {