You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2019/02/20 08:13:41 UTC
svn commit: r1853929 - /httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
Author: ylavic
Date: Wed Feb 20 08:13:41 2019
New Revision: 1853929
URL: http://svn.apache.org/viewvc?rev=1853929&view=rev
Log:
mod_reqtimeout: follow up to r1853901: fix macro args.
Modified:
httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=1853929&r1=1853928&r2=1853929&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Wed Feb 20 08:13:41 2019
@@ -469,9 +469,9 @@ static void *reqtimeout_create_srv_confi
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); \