diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-04 17:32:55 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-04 17:32:55 +0000 |
| commit | ac52f52bf8612679be733406bf6fce7f211a169e (patch) | |
| tree | ab94251bff57159bc0a1af9274822c07f4aeaed2 | |
| parent | c934314cff4725a0d6ff27490a3293a214b98b22 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@216548 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | UPGRADE-1.6.txt | 6 | ||||
| -rw-r--r-- | main/pbx.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/UPGRADE-1.6.txt b/UPGRADE-1.6.txt index c6ed5404b..9d09ab002 100644 --- 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 619ce1654..d51dce0a2 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -943,7 +943,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); |