3 files changed, 4 insertions, 11 deletions
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 453418bb..a04dca3d 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -19,11 +19,7 @@ max_connections = 2048
 authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
 default_handler = {couch_httpd_db, handle_request}
 secure_rewrites = true
-vhost_global_handlers = _utils
- _uuids
- _session
- _oauth
- _users
+vhost_global_handlers = _utils, _uuids, _session, _oauth, _users
 jsonp = false
 
 [log]
@@ -116,10 +112,7 @@ samples = [0, 60, 300, 900]
 
 [attachments]
 compression_level = 8 ; from 1 (lowest, fastest) to 9 (highest, slowest), 0 to disable compression
-compressible_types = text/*
- application/javascript
- application/json
- application/xml
+compressible_types = text/*, application/javascript, application/json,  application/xml
 
 [replicator]
 max_http_sessions = 10
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(