Hanno Böck commited on 2014-05-03 08:42:17
Zeige 1 geänderte Dateien mit 13 Einfügungen und 0 Löschungen.
... | ... |
@@ -0,0 +1,13 @@ |
1 |
+Index: modules/ssl/ssl_engine_config.c |
|
2 |
+=================================================================== |
|
3 |
+--- modules/ssl/ssl_engine_config.c (revision 1585379) |
|
4 |
++++ modules/ssl/ssl_engine_config.c (working copy) |
|
5 |
+@@ -243,7 +243,7 @@ |
|
6 |
+ } |
|
7 |
+ |
|
8 |
+ #define cfgMerge(el,unset) mrg->el = (add->el == (unset)) ? base->el : add->el |
|
9 |
+-#define cfgMergeArray(el) mrg->el = apr_array_append(p, add->el, base->el) |
|
10 |
++#define cfgMergeArray(el) mrg->el = apr_array_append(p, base->el, add->el) |
|
11 |
+ #define cfgMergeString(el) cfgMerge(el, NULL) |
|
12 |
+ #define cfgMergeBool(el) cfgMerge(el, UNSET) |
|
13 |
+ #define cfgMergeInt(el) cfgMerge(el, UNSET) |
|
0 | 14 |