couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [1/3] git commit: Tolerate whitespace runs in .ini files
Date Wed, 02 Nov 2011 15:42:57 GMT
Updated Branches:
  refs/heads/1.1.x 34dfda694 -> 1aee94188
  refs/heads/1.2.x 805d4503b -> d63094356
  refs/heads/master 2bdc0b4f0 -> 64cda84a5


Tolerate whitespace runs in .ini files

Previously we tolerated exactly one character of white space on
either side of the equals sign in .ini files. Now you can have lots.

CouchDB-1328


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/64cda84a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/64cda84a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/64cda84a

Branch: refs/heads/master
Commit: 64cda84a5a1bd6963ddded78f60d86c8e5d6e548
Parents: 2bdc0b4
Author: Robert Newson <rnewson@apache.org>
Authored: Wed Nov 2 15:36:25 2011 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed Nov 2 15:42:03 2011 +0000

----------------------------------------------------------------------
 src/couchdb/couch_config.erl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/64cda84a/src/couchdb/couch_config.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_config.erl b/src/couchdb/couch_config.erl
index 792ff5a..f669853 100644
--- a/src/couchdb/couch_config.erl
+++ b/src/couchdb/couch_config.erl
@@ -210,7 +210,7 @@ parse_ini_file(IniFile) ->
             ";" ++ _Comment ->
                 {AccSectionName, AccValues};
             Line2 ->
-                case re:split(Line2, "\s?=\s?", [{return, list}]) of
+                case re:split(Line2, "\s*=\s*", [{return, list}]) of
                 [Value] ->
                     MultiLineValuePart = case re:run(Line, "^ \\S", []) of
                     {match, _} ->


Mime
View raw message