From: zuul <zuul@gerrit.asterisk.org>
Date: Mon, 14 Nov 2016 19:08:58 +0000 (-0600)
Subject: Merge "res_pjsip.c: Rework endpt_send_request() req_wrapper code." into 14
X-Git-Tag: 14.2.0-rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2401e270238ef01cb6638ecf7f3520ddee6925a0;p=thirdparty%2Fasterisk.git

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

2401e270238ef01cb6638ecf7f3520ddee6925a0
diff --cc res/res_pjsip.c
index c676a86c86,1f51dc63ad..ea81cd5a4d
--- a/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