summaryrefslogtreecommitdiff
path: root/src/couchdb
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2010-05-19 22:25:39 +0000
committerJan Lehnardt <jan@apache.org>2010-05-19 22:25:39 +0000
commit78685de6d952e2e123de224663b818931becb454 (patch)
treed5e99d49e93ca4fa2bb78cef31e000c8061ac7b8 /src/couchdb
parent2bae1cc94a9f625506bd8d5fcbcabdd86dc899d3 (diff)
no newlines in .ini files
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@946465 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
-rw-r--r--src/couchdb/couch_httpd.erl2
-rw-r--r--src/couchdb/couch_util.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 15b3de1a..aa434a36 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -39,7 +39,7 @@ start_link() ->
VirtualHosts = couch_config:get("vhosts"),
VhostGlobals = re:split(
couch_config:get("httpd", "vhost_global_handlers", ""),
- "\\s+",
+ ", ?",
[{return, list}]
),
DefaultSpec = "{couch_httpd_db, handle_request}",
diff --git a/src/couchdb/couch_util.erl b/src/couchdb/couch_util.erl
index af27636b..69f78042 100644
--- a/src/couchdb/couch_util.erl
+++ b/src/couchdb/couch_util.erl
@@ -397,7 +397,7 @@ compressible_att_type(MimeType) when is_binary(MimeType) ->
compressible_att_type(MimeType) ->
TypeExpList = re:split(
couch_config:get("attachments", "compressible_types", ""),
- "\\s+",
+ ", ?",
[{return, list}]
),
lists:any(