diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2012-04-11 09:56:30 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2012-04-11 09:56:30 +0000 |
| commit | 62b937b3331add2477d0f6f2d8474aa98fc1218d (patch) | |
| tree | e213db4ebb794544f64ed15a159312098a3702ff /src/http/modules/ngx_http_browser_module.c | |
| parent | b9c226abe074b82a2bbca514ab5539ee0672fb01 (diff) | |
| download | nginx-62b937b3331add2477d0f6f2d8474aa98fc1218d.tar.gz nginx-62b937b3331add2477d0f6f2d8474aa98fc1218d.zip | |
Fixed directives inheritance.
Diffstat (limited to 'src/http/modules/ngx_http_browser_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_browser_module.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/http/modules/ngx_http_browser_module.c b/src/http/modules/ngx_http_browser_module.c index 13a714538..80da0d8fa 100644 --- a/src/http/modules/ngx_http_browser_module.c +++ b/src/http/modules/ngx_http_browser_module.c @@ -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. */ - if (conf->modern_browsers == NULL) { + if (conf->modern_browsers == NULL && conf->modern_unlisted_browsers == 0) { 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; 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->netscape4 = prev->netscape4; } if (conf->modern_browser_value == NULL) { |