diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-11-07 21:08:08 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-11-07 21:08:08 +0000 |
| commit | e9bf7b33c7a95cc7f749f21a54ef92714e1e4565 (patch) | |
| tree | 489367e127d16981ddf9023e9f94f675e9d696d2 | |
| parent | bd126404ee12f7e17c2d8b88cb3bb248bcea7aaa (diff) | |
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.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1032391 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | share/www/script/test/attachments_multipart.js | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd_db.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/www/script/test/attachments_multipart.js b/share/www/script/test/attachments_multipart.js index ce35e653..96fe344f 100644 --- a/share/www/script/test/attachments_multipart.js +++ b/share/www/script/test/attachments_multipart.js @@ -200,7 +200,7 @@ couchTests.attachments_multipart= function(debug) { // 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); diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl index 34e38f77..77b891fe 100644 --- a/src/couchdb/couch_httpd_db.erl +++ b/src/couchdb/couch_httpd_db.erl @@ -600,7 +600,7 @@ db_doc_req(#httpd{method='GET'}=Req, Db, DocId) -> {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 -> |