[asterisk-commits] kmoore: trunk r334008 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Aug 31 10:20:21 2011
New Revision: 334008

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334008
Log:
Merged revisions 334007 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334007 | kmoore | 2011-08-31 10:19:30 -0500 (Wed, 31 Aug 2011) | 14 lines
  
  Merged revisions 334006 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334006 | kmoore | 2011-08-31 10:18:37 -0500 (Wed, 31 Aug 2011) | 7 lines
    
    Correct an AMI protocol violation with SIPshowpeer
    
    The response of SIPshowpeer ends with "\r\n\r\n". Since other commands are
    ended by using \r\n this confuses any interfacing script.
    
    (closes issue ASTERISK-17486)
  ........
................

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=334008&r1=334007&r2=334008
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Aug 31 10:20:21 2011
@@ -17173,7 +17173,7 @@
 	a[3] = peer;
 
 	_sip_show_peer(1, -1, s, m, 4, a);
-	astman_append(s, "\r\n\r\n" );
+	astman_append(s, "\r\n" );
 	return 0;
 }