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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@216549 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE-1.6.txt b/UPGRADE-1.6.txt
index c6ed5404b28aa5dc78ee489003543c09209a3458..9d09ab0022c88e770a98ac273a2f0ac7fc781692 100644 (file)
--- a/UPGRADE-1.6.txt
+++ b/UPGRADE-1.6.txt
@@ -71,6 +71,12 @@ Core:
   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.

diff --git a/main/pbx.c b/main/pbx.c
index a2e3f7a9b164ecf433074ffcfe5290eac8c7757b..a072c9a41527d2e2e5b68a25b8650fcdc1ee2d46 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -952,7 +952,7 @@ int pbx_exec(struct ast_channel *c,                 /*!< Channel */
        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);