Author: ru
Date: 2012-04-11 09:56:30 +0000 (Wed, 11 Apr 2012)
New Revision: 4582
URL: http://trac.nginx.org/nginx/changeset/4582/nginx

Log:
Fixed directives inheritance.


Modified:
trunk/src/http/modules/ngx_http_browser_module.c

Modified: trunk/src/http/modules/ngx_http_browser_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_browser_module.c 2012-04-10 13:25:53 UTC (rev 4581)
+++ trunk/src/http/modules/ngx_http_browser_module.c 2012-04-11 09:56:30 UTC (rev 4582)
@@ -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) {

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel