diff options
author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-11-07 21:09:17 +0000 |
---|---|---|
committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-11-07 21:09:17 +0000 |
commit | f91636c7085932952b30424662623dc3c6f7f07f (patch) | |
tree | feeb5baaadc2b010ef921eaa31b4c75f4e821ec3 | |
parent | 537ce23994d1f180a52d977213e8622e530aaf99 (diff) |
Merged revision 1032391 from trunk:
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/branches/1.0.x@1032392 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 2b79e559..5edf4d2c 100644 --- a/share/www/script/test/attachments_multipart.js +++ b/share/www/script/test/attachments_multipart.js @@ -193,7 +193,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 cf4e2120..7b09bf57 100644 --- a/src/couchdb/couch_httpd_db.erl +++ b/src/couchdb/couch_httpd_db.erl @@ -576,7 +576,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 -> |