Increase legibility of the max_line_length behavior, and adjust for

the requirement that all members are initialized explicitly due to
the previous patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1688341 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/mod_substitute.c b/modules/filters/mod_substitute.c
index ed8ca0ef9d2cb8da3d278c647f41aad67099fb2b..e3101933d77346049655ebe47b8c44564392be0d 100644 (file)
--- a/modules/filters/mod_substitute.c
+++ b/modules/filters/mod_substitute.c
@@ -75,6 +75,7 @@ static void *create_substitute_dcfg(apr_pool_t *p, char *d)
 
     dcfg->patterns = apr_array_make(p, 10, sizeof(subst_pattern_t));
     dcfg->max_line_length = AP_SUBST_MAX_LINE_LENGTH;
+    dcfg->max_line_length_set = 0;
     dcfg->inherit_before = -1;
     return dcfg;
 }
@@ -104,9 +105,9 @@ static void *merge_substitute_dcfg(apr_pool_t *p, void *basev, void *overv)
                                           base->patterns);
     }
     a->max_line_length = over->max_line_length_set ?
-                         over->max_line_length : base->max_line_length;
-    a->max_line_length_set = over->max_line_length_set ?
-                             over->max_line_length_set : base->max_line_length_set;
+                             over->max_line_length : base->max_line_length;
+    a->max_line_length_set = over->max_line_length_set
+                           | base->max_line_length_set;
     return a;
 }