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

Fixed directives inheritance.

Browse Source
This commit is contained in:
Ruslan Ermilov 2012-04-11 09:56:30 +00:00
parent b9c226abe0
commit 62b937b333
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/http/modules/ngx_http_browser_module.c
View File

@ -458,10 +458,11 @@ ngx_http_browser_merge_conf(ngx_conf_t *cf, void *parent, void *child)
* with a real skip value. The zero value means Opera. * with a real skip value. The zero value means Opera.
*/ */
if (conf->modern_browsers == NULL) { if (conf->modern_browsers == NULL && conf->modern_unlisted_browsers == 0) {
conf->modern_browsers = prev->modern_browsers; conf->modern_browsers = prev->modern_browsers;
conf->modern_unlisted_browsers = prev->modern_unlisted_browsers;
} else { } else if (conf->modern_browsers != NULL) {
browsers = conf->modern_browsers->elts; browsers = conf->modern_browsers->elts;
for (i = 0; i < conf->modern_browsers->nelts; i++) { for (i = 0; i < conf->modern_browsers->nelts; i++) {
@ -501,8 +502,9 @@ found:
} }
} }
if (conf->ancient_browsers == NULL) { if (conf->ancient_browsers == NULL && conf->netscape4 == 0) {
conf->ancient_browsers = prev->ancient_browsers; conf->ancient_browsers = prev->ancient_browsers;
conf->netscape4 = prev->netscape4;
} }
if (conf->modern_browser_value == NULL) { if (conf->modern_browser_value == NULL) {