summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-09-08 13:25:57 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-09-08 13:25:57 -0500
commit345253fb71d08a70f3ae49e59b37445a2c91e421 (patch)
treef9623f99f7740f9d18c2a40116aca8b97bd43061 /res
parentbe42630f5be3219e1f5af9a449bae3d4ec742b0c (diff)
parent2e5da0c715456d48b70b1afc6f089a0c19d98983 (diff)
Merge "res_pjsip: Allow global headers to be overridden."
Diffstat (limited to 'res')
-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;