diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-19 16:36:22 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-19 16:36:22 +0000 |
commit | abaeeeb23d179111ed6d3c75bc66d23adc5bb6c9 (patch) | |
tree | e4d19be4fbc7551cc6f50eeb7f5a28c3218e8ef4 /main | |
parent | 5461a9b67df5000d4d03d6b8795ccc8cb0c9e2bf (diff) |
Merged revisions 138815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r138815 | murf | 2008-08-19 09:59:12 -0600 (Tue, 19 Aug 2008) | 19 lines
These changes are in regards to bug 13249, where users are being surprised by the changes made
to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if
they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x
installation where a "make samples" was executed, or where they hand-edited the
asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher).
(this commit does not totally solve 13249, at least not yet)
The change involves issueing a single warning while the AEL file is loading, if:
1. app_set is present in the config file, and set to 1.6 or higher.
2. there are double quotes in an assignment statement (eg x = "hi there";)
3. the warning was not already issued.
The standalone app, aelparse, does not (yet) issue this warning. I'd have to
have it read in the asterisk.conf file, and that's a bit of hassle. I'll add
it if users request it, tho.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138846 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/pbx.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index f76314794..8846a9e72 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -665,6 +665,11 @@ static struct pbx_builtin { "channel. If the variable name is prefixed with __, the variable will be\n" "inherited into channels created from the current channel and all children\n" "channels.\n" + "Compatibility note: If (and only if), in /etc/asterisk/asterisk.conf, you have a [compat]\n" + "category, and you have app_set = 1.6 under that, then the behavior of this\n" + "app changes, and does not strip surrounding quotes from the right hand side\n" + "as it did previously in 1.4. The app_set = 1.6 is only inserted if 'make samples'\n" + "is executed, or if the users inserts this by hand into the asterisk.conf file.\n" }, { "MSet", pbx_builtin_setvar_multiple, @@ -677,7 +682,8 @@ static struct pbx_builtin { "inherited into channels created from the current channel and all children\n" "channels.\n\n" "MSet behaves in a similar fashion to the way Set worked in 1.2/1.4 and is thus\n" - "prone to doing things that you may not expect. Avoid its use if possible.\n" + "prone to doing things that you may not expect. For example, it strips surrounding\n" + "double-quotes from the right-hand side (value). Avoid its use if possible.\n" }, { "SetAMAFlags", pbx_builtin_setamaflags, |