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

diff --cc res/res_pjsip.c
index 8ac63204b660d0106e889b260374dbdf5f47f5b1,da4990d913f9f21eca2fd6f2894f796c44fd152b..dd4a619d2a51fe61b05f1638341fc21db2278903
--- 1/res/res_pjsip.c
--- 2/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@@ -3555,13 -3566,8 +3566,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