From commits-return-5822-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Thu Jan 20 13:01:07 2011 Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 67583 invoked from network); 20 Jan 2011 13:01:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Jan 2011 13:01:07 -0000 Received: (qmail 92389 invoked by uid 500); 20 Jan 2011 13:01:07 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 92266 invoked by uid 500); 20 Jan 2011 13:01:05 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 92258 invoked by uid 99); 20 Jan 2011 13:01:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 13:01:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 13:01:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BF13223889E7; Thu, 20 Jan 2011 13:00:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1061283 - in /couchdb/trunk: etc/couchdb/default.ini.tpl.in src/couchdb/couch_db.erl Date: Thu, 20 Jan 2011 13:00:41 -0000 To: commits@couchdb.apache.org From: rnewson@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110120130041.BF13223889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rnewson Date: Thu Jan 20 13:00:41 2011 New Revision: 1061283 URL: http://svn.apache.org/viewvc?rev=1061283&view=rev Log: COUCHDB-1034 - ignore runs of whitespace between content types in compressible_types list Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in couchdb/trunk/src/couchdb/couch_db.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=1061283&r1=1061282&r2=1061283&view=diff ============================================================================== --- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original) +++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Thu Jan 20 13:00:41 2011 @@ -132,7 +132,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] db = _replicator Modified: couchdb/trunk/src/couchdb/couch_db.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_db.erl?rev=1061283&r1=1061282&r2=1061283&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_db.erl (original) +++ couchdb/trunk/src/couchdb/couch_db.erl Thu Jan 20 13:00:41 2011 @@ -868,7 +868,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(