[svn-commits] gtjoseph: branch 12 r427329 - /branches/12/

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed Nov 5 09:05:06 CST 2014


Author: gtjoseph
Date: Wed Nov  5 09:05:00 2014
New Revision: 427329

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427329
Log:
Recorded merge of revisions 427328 from http://svn.asterisk.org/svn/asterisk/branches/11

........
config: Make text_file_save and 'dialplan save' escape semicolons in values.

When a config file is read, an unescaped semicolon signals comments which are
stripped from the value before it's stored.  Escaped semicolons are then
unescaped and become part of the value.  Both of these behaviors are normal
and expected.  When the config is serialized either by 'dialplan save' or
AMI/UpdateConfig however, the now unescaped semicolons are written as-is.
If you actually reload the file just saved, the unescaped semicolons are
now treated as start of comments.

Since true comments are stripped on read, any semicolons in
ast_variable.value must have been escaped originally.  This patch
re-escapes semicolons in ast_variable.values before they're written to
file either by 'dialplan save' or config/ast_config_text_file_save which
is called by AMI/UpdateConfig. I also fixed a few pre-existing formatting
issues nearby in pbx_config.c

Tested-by: George Joseph
ASTERISK-20127 #close

Review: https://reviewboard.asterisk.org/r/4132/

Modified:
    branches/12/   (props changed)

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.




More information about the svn-commits mailing list