mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 02:09:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Access module: fixed inheritance of allow/deny ipv6 rules.

Browse Source 
Previous (incorrect) behaviour was to inherit ipv6 rules separately from
ipv4 ones.  Now all rules are either inherited (if there are no rules
defined at current level) or not (if there are any rules defined).
This commit is contained in:
Maxim Dounin 2012-04-10 13:25:53 +00:00
parent 3ef52765c8
commit b9c226abe0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/http/modules/ngx_http_access_module.c
View File

@ -351,14 +351,19 @@ ngx_http_access_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_access_loc_conf_t *prev = parent;
ngx_http_access_loc_conf_t *conf = child;
#if (NGX_HAVE_INET6)
if (conf->rules == NULL && conf->rules6 == NULL) {
conf->rules = prev->rules;
conf->rules6 = prev->rules6;
}
#else
if (conf->rules == NULL) {
conf->rules = prev->rules;
}
#if (NGX_HAVE_INET6)
if (conf->rules6 == NULL) {
conf->rules6 = prev->rules6;
}
#endif
return NGX_CONF_OK;