[asterisk-commits] file: trunk r64045 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Sat May 12 11:33:34 2007
New Revision: 64045

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64045
Log:
Merged revisions 64044 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r64044 | file | 2007-05-12 12:32:15 -0400 (Sat, 12 May 2007) | 2 lines

Ensure the onhold flag is set no matter what when being put on hold.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=64045&r1=64044&r2=64045
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sat May 12 11:33:34 2007
@@ -5724,6 +5724,8 @@
 			ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_ONEDIR);
 		else if (sendonly == 2)	/* Inactive stream */
 			ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_INACTIVE);
+		else
+			ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD);
 		if (global_notifyhold)
 			sip_peer_hold(p, TRUE);
 	}