[asterisk-commits] tilghman: branch 1.6.1 r216549 - in /branches/1.6.1: ./ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Sep  4 12:33:47 2009
New Revision: 216549

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=216549
Log:
Merged revisions 216547 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r216547 | tilghman | 2009-09-04 12:31:44 -0500 (Fri, 04 Sep 2009) | 3 lines
  
  Enable turning off the application delimiter warning with the 'dontwarn' option.
  Suggested on the -dev list, and implemented in an alternate way by me.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/UPGRADE-1.6.txt
    branches/1.6.1/main/pbx.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/UPGRADE-1.6.txt
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/UPGRADE-1.6.txt?view=diff&rev=216549&r1=216548&r2=216549
==============================================================================
--- branches/1.6.1/UPGRADE-1.6.txt (original)
+++ branches/1.6.1/UPGRADE-1.6.txt Fri Sep  4 12:33:47 2009
@@ -71,6 +71,12 @@
   You now only need to quote strings in configuration files if you literally
   want quotation marks within a string.
 
+* Any applications run that contain the pipe symbol but not a comma symbol will
+  get a warning printed to the effect that the application delimiter has changed.
+  However, there are legitimate reasons why this might be useful in certain
+  situations, so this warning can be turned off with the dontwarn option in
+  asterisk.conf.
+
 * The logger.conf option 'rotatetimestamp' has been deprecated in favor of
   'rotatestrategy'.  This new option supports a 'rotate' strategy that more
   closely mimics the system logger in terms of file rotation.

Modified: branches/1.6.1/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=216549&r1=216548&r2=216549
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Fri Sep  4 12:33:47 2009
@@ -952,7 +952,7 @@
 	if (app->module)
 		u = __ast_module_user_add(app->module, c);
 	if (strcasecmp(app->name, "system") && !ast_strlen_zero(data) &&
-			strchr(data, '|') && !strchr(data, ',')) {
+			strchr(data, '|') && !strchr(data, ',') && !ast_opt_dont_warn) {
 		ast_log(LOG_WARNING, "The application delimiter is now the comma, not "
 			"the pipe.  Did you forget to convert your dialplan?  (%s(%s))\n",
 			app->name, (char *) data);