summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-09-08 13:06:59 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-09-08 13:06:59 -0500
commitfdb29f1b4eeee4af03942865de1638a3f722511f (patch)
tree633110480b040c665fc2d6c357b3d652484ada65
parent02ff55626ec2f47085c55301d511a3db0d0df248 (diff)
parent5f19657710aa82c76f48a1a4f49cd92e6cd8e1f6 (diff)
Merge "res_pjsip: Allow global headers to be overridden." into 13
-rw-r--r--res/res_pjsip/pjsip_global_headers.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/res/res_pjsip/pjsip_global_headers.c b/res/res_pjsip/pjsip_global_headers.c
index 735008dcc..501f5f523 100644
--- a/res/res_pjsip/pjsip_global_headers.c
+++ b/res/res_pjsip/pjsip_global_headers.c
@@ -87,6 +87,14 @@ static void add_headers_to_message(struct header_list *headers, pjsip_tx_data *t
return;
}
AST_LIST_TRAVERSE(headers, iter, next) {
+ pj_str_t name;
+ pjsip_generic_string_hdr *hdr;
+
+ hdr = pjsip_msg_find_hdr_by_name(tdata->msg, pj_cstr(&name, iter->name), NULL);
+ if (hdr) {
+ continue;
+ }
+
ast_sip_add_header(tdata, iter->name, iter->value);
};
tdata->mod_data[global_header_mod.id] = &handled_id;