From: Tilghman Lesher Date: Mon, 22 Mar 2010 17:01:21 +0000 (+0000) Subject: Merged revisions 253712 via svnmerge from X-Git-Tag: 1.6.1.19-rc1~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbdb786ef4f29c0970293fccdd29bec71daf54d4;p=thirdparty%2Fasterisk.git Merged revisions 253712 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r253712 | tilghman | 2010-03-22 11:59:35 -0500 (Mon, 22 Mar 2010) | 2 lines Accomodate equal signs in DSNs and add documentation, based upon mmichelson's feedback. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253713 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/dbsep.conf.sample b/configs/dbsep.conf.sample index 00d187d147..9e0dd04e0e 100644 --- a/configs/dbsep.conf.sample +++ b/configs/dbsep.conf.sample @@ -22,6 +22,7 @@ # # The Data Source Name, as specified by the Perl DBI module. +# Typically, this will be along the lines of 'DBI:mysql:astdbname[:dbhostname]' or 'DBI:Pg:dbname=astdbname;hostname=dbhostname' dsn=somedsn # Connected database user diff --git a/contrib/scripts/dbsep.cgi b/contrib/scripts/dbsep.cgi index 8010b21c35..834067331e 100755 --- a/contrib/scripts/dbsep.cgi +++ b/contrib/scripts/dbsep.cgi @@ -36,8 +36,8 @@ while () { chomp; next if (m/^[#;]/); next if (m/^\s*$/); - my ($name,$value) = split '='; - $cfg{lc($name)} = $value; + my ($name,@value) = split '='; + $cfg{lc($name)} = join('=', @value); } close CFG;