Merge "res_pjsip.c: Rework endpt_send_request() req_wrapper code." into 14

diff --cc res/res_pjsip.c
index c676a86c868eabfb94b077047faa592c6a277280,1f51dc63ad3e3d78351d09fe5c19173e34471d04..ea81cd5a4d0b3394fadc89ff5b6dd52afa90800c
--- 1/res/res_pjsip.c
--- 2/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@@ -3551,13 -3562,8 +3562,9 @@@ static pj_status_t endpt_send_request(s
                                pj_strbuf(&tdata->msg->line.req.method.name),
                                endpoint ? ast_sorcery_object_get_id(endpoint) : "<unknown>");
                        ao2_t_ref(req_wrapper, -2, "Drop timer and routine ref");
 +                      pjsip_tx_data_dec_ref(tdata);
                        return ret_val;
                }
- 
-               req_wrapper->timeout_timer->id = TIMEOUT_TIMER2;
-       } else {
-               req_wrapper->timeout_timer = NULL;
        }
  
        /* We need to insure that the wrapper and tdata are available when the