View | Details | Raw Unified | Return to bug 56353
Collapse All | Expand All

(-)modules/ssl/ssl_engine_config.c (-1 / +1 lines)
Lines 243-249 Link Here
243
}
243
}
244
244
245
#define cfgMerge(el,unset)  mrg->el = (add->el == (unset)) ? base->el : add->el
245
#define cfgMerge(el,unset)  mrg->el = (add->el == (unset)) ? base->el : add->el
246
#define cfgMergeArray(el)   mrg->el = apr_array_append(p, add->el, base->el)
246
#define cfgMergeArray(el)   mrg->el = apr_array_append(p, base->el, add->el)
247
#define cfgMergeString(el)  cfgMerge(el, NULL)
247
#define cfgMergeString(el)  cfgMerge(el, NULL)
248
#define cfgMergeBool(el)    cfgMerge(el, UNSET)
248
#define cfgMergeBool(el)    cfgMerge(el, UNSET)
249
#define cfgMergeInt(el)     cfgMerge(el, UNSET)
249
#define cfgMergeInt(el)     cfgMerge(el, UNSET)

Return to bug 56353