From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 20 Feb 2019 08:13:41 +0000 (+0000)
Subject: mod_reqtimeout: follow up to r1853901: fix macro args.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5160a03ef8c9179402820084154f736036c8831a;p=apache

mod_reqtimeout: follow up to r1853901: fix macro args.


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

diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index 80aa7db4f5..e6e93e65d1 100644
--- a/modules/filters/mod_reqtimeout.c
+++ b/modules/filters/mod_reqtimeout.c
@@ -469,9 +469,9 @@ static void *reqtimeout_create_srv_config(apr_pool_t *p, server_rec *s)
     return cfg;
 }
 
-#define MERGE_INT(cfg, b, a, val) \
-    cfg->val = (a->val == UNSET) ? b->val : a->val
-#define MERGE_STAGE(cfg, b, a, stage) do { \
+#define MERGE_INT(cfg, base, add, val) \
+    cfg->val = (add->val == UNSET) ? base->val : add->val
+#define MERGE_STAGE(cfg, base, add, stage) do { \
     MERGE_INT(cfg, base, add, stage.timeout); \
     MERGE_INT(cfg, base, add, stage.max_timeout); \
     MERGE_INT(cfg, base, add, stage.min_rate); \