Changes with Apache 2.0.41
+ *) Fix a null pointer dereference in the merge_env_dir_configs
+ function of the mod_env module. PR 11791
+ [Paul J. Reder]
+
*) New option to ServerTokens 'maj[or]'. Only show the major version
Also Surfaced this directive in the standard config (default FULL)
[Ian Holsman]
res->unsetenv = NULL;
arr = apr_table_elts(add->unsetenv);
- elts = (const apr_table_entry_t *)arr->elts;
+ if (arr) {
+ elts = (const apr_table_entry_t *)arr->elts;
- for (i = 0; i < arr->nelts; ++i) {
- apr_table_unset(res->vars, elts[i].key);
+ for (i = 0; i < arr->nelts; ++i) {
+ apr_table_unset(res->vars, elts[i].key);
+ }
}
arr = apr_table_elts(add->vars);
- elts = (const apr_table_entry_t *)arr->elts;
+ if (arr) {
+ elts = (const apr_table_entry_t *)arr->elts;
- for (i = 0; i < arr->nelts; ++i) {
- apr_table_setn(res->vars, elts[i].key, elts[i].val);
+ for (i = 0; i < arr->nelts; ++i) {
+ apr_table_setn(res->vars, elts[i].key, elts[i].val);
+ }
}
return res;