Author: rnewson
Date: Thu Jan 20 12:59:21 2011
New Revision: 1061281

URL: http://svn.apache.org/viewvc?rev=1061281&view=rev
Log:
COUCHDB-1034 - ignore runs of whitespace between content types in compressible_types list

Modified:
    couchdb/branches/1.0.x/etc/couchdb/default.ini.tpl.in
    couchdb/branches/1.0.x/src/couchdb/couch_util.erl

Modified: couchdb/branches/1.0.x/etc/couchdb/default.ini.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/etc/couchdb/default.ini.tpl.in?rev=1061281&r1=1061280&r2=1061281&view=diff
==============================================================================
--- couchdb/branches/1.0.x/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/branches/1.0.x/etc/couchdb/default.ini.tpl.in Thu Jan 20 12:59:21 2011
@@ -117,7 +117,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 = 20

Modified: couchdb/branches/1.0.x/src/couchdb/couch_util.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/couch_util.erl?rev=1061281&r1=1061280&r2=1061281&view=diff
==============================================================================
--- couchdb/branches/1.0.x/src/couchdb/couch_util.erl (original)
+++ couchdb/branches/1.0.x/src/couchdb/couch_util.erl Thu Jan 20 12:59:21 2011
@@ -413,7 +413,7 @@ compressible_att_type(MimeType) when is_
 compressible_att_type(MimeType) ->
     TypeExpList = re:split(
         couch_config:get("attachments", "compressible_types", ""),
-        ", ?",
+        "\\s*,\\s*",
         [{return, list}]
     ),
     lists:any(