- fwd_req->expiration_interval = cfg_apc->expiration_interval;
- else fwd_req->expiration_interval = cfg_comm->expiration_interval;
+ expiration_interval = cfg_apc->expiration_interval;
+ else expiration_interval = cfg_comm->expiration_interval;
+ if (fwd_req->expiration_interval)
+ fwd_req->expiration_interval = (expiration_interval < fwd_req->expiration_interval) ? expiration_interval : fwd_req->expiration_interval;
+ else fwd_req->expiration_interval = expiration_interval;