[svn-commits] tilghman: branch 1.6.1 r253713 - in /branches/1.6.1: ./ configs/ contrib/scri...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Mar 22 12:01:21 2010
New Revision: 253713

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253713
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/dbsep.conf.sample
    branches/1.6.1/contrib/scripts/dbsep.cgi

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configs/dbsep.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configs/dbsep.conf.sample?view=diff&rev=253713&r1=253712&r2=253713
==============================================================================
--- branches/1.6.1/configs/dbsep.conf.sample (original)
+++ branches/1.6.1/configs/dbsep.conf.sample Mon Mar 22 12:01:21 2010
@@ -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

Modified: branches/1.6.1/contrib/scripts/dbsep.cgi
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/contrib/scripts/dbsep.cgi?view=diff&rev=253713&r1=253712&r2=253713
==============================================================================
--- branches/1.6.1/contrib/scripts/dbsep.cgi (original)
+++ branches/1.6.1/contrib/scripts/dbsep.cgi Mon Mar 22 12:01:21 2010
@@ -36,8 +36,8 @@
 	chomp;
 	next if (m/^[#;]/);
 	next if (m/^\s*$/);
-	my ($name,$value) = split '=';
-	$cfg{lc($name)} = $value;
+	my ($name, at value) = split '=';
+	$cfg{lc($name)} = join('=', @value);
 }
 close CFG;