commit 62b937b3331add2477d0f6f2d8474aa98fc1218d
author Ruslan Ermilov <ru@nginx.com> Wed Apr 11 09:56:30 2012 +0000
committer Ruslan Ermilov <ru@nginx.com> Wed Apr 11 09:56:30 2012 +0000
tree e213db4ebb794544f64ed15a159312098a3702ff
parent b9c226abe074b82a2bbca514ab5539ee0672fb01

Fixed directives inheritance.

src/http/modules/ngx_http_browser_module.c

diff --git a/src/http/modules/ngx_http_browser_module.c b/src/http/modules/ngx_http_browser_module.c
index 13a7145..80da0d8 100644
--- a/src/http/modules/ngx_http_browser_module.c
+++ b/src/http/modules/ngx_http_browser_module.c
@@ -458,10 +458,11 @@
      * 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 @@
         }
     }
 
-    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) {