svn commit: r946465 - in /couchdb/trunk: etc/couchdb/default.ini.tpl.in src/couchdb/couch_httpd.erl src/couchdb/couch_util.erl

[ja...@apache.org]

Author: jan
Date: Wed May 19 22:25:39 2010
New Revision: 946465

URL: http://svn.apache.org/viewvc?rev=946465&view=rev
Log:
no newlines in .ini files

Modified:
    couchdb/trunk/etc/couchdb/default.ini.tpl.in
    couchdb/trunk/src/couchdb/couch_httpd.erl
    couchdb/trunk/src/couchdb/couch_util.erl

Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=946465&r1=946464&r2=946465&view=diff
==============================================================================
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Wed May 19 22:25:39 2010
@@ -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

Modified: couchdb/trunk/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd.erl?rev=946465&r1=946464&r2=946465&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd.erl Wed May 19 22:25:39 2010
@@ -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}",

Modified: couchdb/trunk/src/couchdb/couch_util.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_util.erl?rev=946465&r1=946464&r2=946465&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_util.erl (original)
+++ couchdb/trunk/src/couchdb/couch_util.erl Wed May 19 22:25:39 2010
@@ -397,7 +397,7 @@ compressible_att_type(MimeType) when is_
 compressible_att_type(MimeType) ->
     TypeExpList = re:split(
         couch_config:get("attachments", "compressible_types", ""),
-        "\\s+",
+        ", ?",
         [{return, list}]
     ),
     lists:any(