Author: jan
Date: Wed May 19 22:38:52 2010
New Revision: 946471
URL: http://svn.apache.org/viewvc?rev=946471&view=rev
Log:
no newlines in .ini files
Modified:
couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in
couchdb/branches/0.11.x/src/couchdb/couch_util.erl
Modified: couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in?rev=946471&r1=946470&r2=946471&view=diff
==============================================================================
--- couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/branches/0.11.x/etc/couchdb/default.ini.tpl.in Wed May 19 22:38:52
2010
@@ -110,7 +110,4 @@ 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
Modified: couchdb/branches/0.11.x/src/couchdb/couch_util.erl
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_util.erl?rev=946471&r1=946470&r2=946471&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_util.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_util.erl Wed May 19 22:38:52 2010
@@ -460,7 +460,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(
