[asterisk-commits] jpeeler: trunk r293306 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Oct 29 16:50:18 2010
New Revision: 293306

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

........
  r293305 | jpeeler | 2010-10-29 16:48:38 -0500 (Fri, 29 Oct 2010) | 9 lines
  
  Modify sip_setoption to not complain about unknown options.
  
  This now behaves just like the other setoption callbacks. For the curious the
  offending option for the reporter was AST_OPTION_CHANNEL_WRITE which was getting
  passed due to a fix for chan_local in 286189.
  
  (closes issue #17985)
  Reported by: globalnetinc
........

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-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=293306&r1=293305&r2=293306
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Oct 29 16:50:18 2010
@@ -4065,7 +4065,6 @@
 		res = 0;
 		break;
 	default:
-		ast_log(LOG_NOTICE, "Unknown option: %d\n", option);
 		break;
 	}