Commit 32035168 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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
parent fa21cfb2

modules/filters/mod_reqtimeout.c

+3 −3
Original line number Diff line number Diff line
@@ -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); \