[asterisk-commits] bebuild: tag 12.1.0-rc3 r409304 - in /tags/12.1.0-rc3: ./ channels/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sat Mar 1 18:33:58 CST 2014
Author: bebuild
Date: Sat Mar 1 18:33:50 2014
New Revision: 409304
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409304
Log:
Update .version, remove old summaries
Removed:
tags/12.1.0-rc3/asterisk-12.1.0-rc2-summary.html
tags/12.1.0-rc3/asterisk-12.1.0-rc2-summary.txt
Modified:
tags/12.1.0-rc3/ (props changed)
tags/12.1.0-rc3/.version
tags/12.1.0-rc3/channels/chan_sip.c
Propchange: tags/12.1.0-rc3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 1 18:33:50 2014
@@ -1,1 +1,1 @@
-/branches/12:407676,407747,407750,407937,408555,408855,409054,409131
+/branches/12:407676,407747,407750,407937,408555,408855,409054,409131,409158
Modified: tags/12.1.0-rc3/.version
URL: http://svnview.digium.com/svn/asterisk/tags/12.1.0-rc3/.version?view=diff&rev=409304&r1=409303&r2=409304
==============================================================================
--- tags/12.1.0-rc3/.version (original)
+++ tags/12.1.0-rc3/.version Sat Mar 1 18:33:50 2014
@@ -1,1 +1,1 @@
-12.1.0-rc2
+12.1.0-rc3
Modified: tags/12.1.0-rc3/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/12.1.0-rc3/channels/chan_sip.c?view=diff&rev=409304&r1=409303&r2=409304
==============================================================================
--- tags/12.1.0-rc3/channels/chan_sip.c (original)
+++ tags/12.1.0-rc3/channels/chan_sip.c Sat Mar 1 18:33:50 2014
@@ -23332,9 +23332,11 @@
/* This 200 OK's SDP is not acceptable, so we need to ack, then hangup */
/* For re-invites, we try to recover */
ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
- ast_channel_hangupcause_set(p->owner, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
p->hangupcause = AST_CAUSE_BEARERCAPABILITY_NOTAVAIL;
- sip_queue_hangup_cause(p, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
+ if (p->owner) {
+ ast_channel_hangupcause_set(p->owner, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
+ sip_queue_hangup_cause(p, AST_CAUSE_BEARERCAPABILITY_NOTAVAIL);
+ }
}
}
ast_rtp_instance_activate(p->rtp);
More information about the asterisk-commits
mailing list