httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1697002 - /httpd/httpd/trunk/modules/filters/mod_substitute.c
Date Fri, 21 Aug 2015 14:19:17 GMT
Author: ylavic
Date: Fri Aug 21 14:19:17 2015
New Revision: 1697002

URL: http://svn.apache.org/r1697002
Log:
mod_substitute: follow up r1684900.
Really inherit before when asked to (inverse if/else contents).

Modified:
    httpd/httpd/trunk/modules/filters/mod_substitute.c

Modified: httpd/httpd/trunk/modules/filters/mod_substitute.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_substitute.c?rev=1697002&r1=1697001&r2=1697002&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_substitute.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_substitute.c Fri Aug 21 14:19:17 2015
@@ -97,13 +97,13 @@ static void *merge_substitute_dcfg(apr_p
      * 'off' to follow the corrected/expected behavior, without violating POLS.
      */
     if (a->inherit_before == 1) {
-        a->patterns = apr_array_append(p, base->patterns,
-                                          over->patterns);
-    }
-    else {
         a->patterns = apr_array_append(p, over->patterns,
                                           base->patterns);
     }
+    else {
+        a->patterns = apr_array_append(p, base->patterns,
+                                          over->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



Mime
View raw message