Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 99814 invoked from network); 7 Nov 2010 21:08:51 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Nov 2010 21:08:51 -0000 Received: (qmail 10330 invoked by uid 500); 7 Nov 2010 21:09:23 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 10287 invoked by uid 500); 7 Nov 2010 21:09:23 -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 10280 invoked by uid 99); 7 Nov 2010 21:09:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Nov 2010 21:09:23 +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; Sun, 07 Nov 2010 21:09:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 783B023889E7; Sun, 7 Nov 2010 21:08:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1032391 - in /couchdb/trunk: share/www/script/test/attachments_multipart.js src/couchdb/couch_httpd_db.erl Date: Sun, 07 Nov 2010 21:08:08 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101107210808.783B023889E7@eris.apache.org> Author: fdmanana Date: Sun Nov 7 21:08:08 2010 New Revision: 1032391 URL: http://svn.apache.org/viewvc?rev=1032391&view=rev Log: Bug fix: the separator for media types in the 'Accept' header is a comma. The semicolon separates a media type from its parameters. A more complete solution, which takes into account Q values, was submitted upstream: https://github.com/mochi/mochiweb/issues/issue/21. Modified: couchdb/trunk/share/www/script/test/attachments_multipart.js couchdb/trunk/src/couchdb/couch_httpd_db.erl Modified: couchdb/trunk/share/www/script/test/attachments_multipart.js URL: http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/attachments_multipart.js?rev=1032391&r1=1032390&r2=1032391&view=diff ============================================================================== --- couchdb/trunk/share/www/script/test/attachments_multipart.js (original) +++ couchdb/trunk/share/www/script/test/attachments_multipart.js Sun Nov 7 21:08:08 2010 @@ -200,7 +200,7 @@ couchTests.attachments_multipart= functi // a certain rev). xhr = CouchDB.request("GET", "/test_suite_db/multipart?atts_since=[\"" + firstrev + "\"]", - {headers:{"accept": "multipart/related,*/*;"}}); + {headers:{"accept": "multipart/related, */*"}}); T(xhr.status == 200); Modified: couchdb/trunk/src/couchdb/couch_httpd_db.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_db.erl?rev=1032391&r1=1032390&r2=1032391&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_httpd_db.erl (original) +++ couchdb/trunk/src/couchdb/couch_httpd_db.erl Sun Nov 7 21:08:08 2010 @@ -600,7 +600,7 @@ db_doc_req(#httpd{method='GET'}=Req, Db, {ok, Results} = couch_db:open_doc_revs(Db, DocId, Revs, Options), AcceptedTypes = case couch_httpd:header_value(Req, "Accept") of undefined -> []; - AcceptHeader -> string:tokens(AcceptHeader, "; ") + AcceptHeader -> string:tokens(AcceptHeader, ", ") end, case lists:member("multipart/mixed", AcceptedTypes) of false ->