diff options
| author |   robert <robert@openbsd.org> | 2012-05-13 09:14:58 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2012-05-13 09:14:58 +0000 |
| commit | 97af15d31a3e788ae1f3063c72204f69e2e38dde (patch) | |
| tree | 40613faa9ab41a3bffd46e7d418c97f022706db8 /usr.sbin/nginx/src/http/modules/ngx_http_browser_module.c | |
| parent | Remove unused and confusing 'head' argument. (diff) | |
| download | wireguard-openbsd-97af15d31a3e788ae1f3063c72204f69e2e38dde.tar.xz wireguard-openbsd-97af15d31a3e788ae1f3063c72204f69e2e38dde.zip | |
update to nginx-1.2.0
Diffstat (limited to 'usr.sbin/nginx/src/http/modules/ngx_http_browser_module.c')
| -rw-r--r-- | usr.sbin/nginx/src/http/modules/ngx_http_browser_module.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/nginx/src/http/modules/ngx_http_browser_module.c b/usr.sbin/nginx/src/http/modules/ngx_http_browser_module.c index 13a7145385e..80da0d8fa86 100644 --- a/usr.sbin/nginx/src/http/modules/ngx_http_browser_module.c +++ b/usr.sbin/nginx/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) { |