Merge "res_pjsip: improve realtime performance" into 13

diff --cc res/res_pjsip.c
Simple merge

diff --cc res/res_pjsip/location.c
index db1d0794b02a68e2e0a6d2ea3737701e435ffefc,c30acc7b8adda129182883cd2b4635737a268773..ef06456a75a04b89ebd7ee3640a5dfdfb7236692
--- 1/res/res_pjsip/location.c
--- 2/res/res_pjsip/location.c
+++ b/res/res_pjsip/location.c
@@@ -1121,9 -1088,9 +1121,10 @@@ int ast_sip_initialize_sorcery_location
        ast_sorcery_object_field_register(sorcery, "contact", "qualify_frequency", 0, OPT_UINT_T,
                PARSE_IN_RANGE, FLDSET(struct ast_sip_contact, qualify_frequency), 0, 86400);
        ast_sorcery_object_field_register(sorcery, "contact", "qualify_timeout", "3.0", OPT_DOUBLE_T, 0, FLDSET(struct ast_sip_contact, qualify_timeout));
+       ast_sorcery_object_field_register(sorcery, "contact", "authenticate_qualify", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_contact, authenticate_qualify));
        ast_sorcery_object_field_register(sorcery, "contact", "outbound_proxy", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_contact, outbound_proxy));
        ast_sorcery_object_field_register(sorcery, "contact", "user_agent", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_contact, user_agent));
 +      ast_sorcery_object_field_register(sorcery, "contact", "reg_server", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_contact, reg_server));
  
        ast_sorcery_object_field_register(sorcery, "aor", "type", "", OPT_NOOP_T, 0, 0);
        ast_sorcery_object_field_register(sorcery, "aor", "minimum_expiration", "60", OPT_UINT_T, 0, FLDSET(struct ast_sip_aor, minimum_expiration));

diff --cc res/res_pjsip/pjsip_options.c
Simple merge