- for (i = 0; i < ParameterLast; ++i)
- setparameter(c, 0, i, &curconfig[i].val);
+ if (!newconfig)
+ newconfig = defconfig;
+
+ for (i = 0; (p = params[i]) != ParameterLast; ++i) {
+ switch(p) {
+ case Certificate:
+ case CookiePolicies:
+ case Style:
+ config = defconfig[p].force ? defconfig :
+ newconfig[p].force ? newconfig :
+ defconfig;
+ break;
+ default:
+ if (defconfig[p].force)
+ continue;
+ config = newconfig[p].force ? newconfig :
+ curconfig[p].force ? defconfig :
+ NULL;
+ }
+
+ if (config)
+ setparameter(c, 0, p, &config[p].val);
+ }
+
+ curconfig = newconfig;