diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2011-05-21 22:01:38 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2011-05-21 22:01:38 +0000 |
| commit | 6f2e87fb5a36bece84a9df3d0cd5c7b87ec60bce (patch) | |
| tree | eee91156ce6fcb65341ccb43b80b45a8be16c3cb | |
| parent | 86c8ffc732052ba5eb942330ad431d1a42297034 (diff) | |
Merged revision 1125828 from trunk
Add missing option to multipart/related GETs
This is necessary as the client needs to be able to know if
attachments are encoded or not.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1125830 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | share/www/script/test/attachments_multipart.js | 7 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd_db.erl | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/share/www/script/test/attachments_multipart.js b/share/www/script/test/attachments_multipart.js index 7f587357..13a5abf4 100644 --- a/share/www/script/test/attachments_multipart.js +++ b/share/www/script/test/attachments_multipart.js @@ -39,7 +39,7 @@ couchTests.attachments_multipart= function(debug) { }, "baz.txt": { "follows":true, - "content_type":"application/test", + "content_type":"text/plain", "length":19 } } @@ -78,12 +78,15 @@ couchTests.attachments_multipart= function(debug) { // now edit an attachment - var doc = db.open("multipart"); + var doc = db.open("multipart", {att_encoding_info: true}); var firstrev = doc._rev; T(doc._attachments["foo.txt"].stub == true); T(doc._attachments["bar.txt"].stub == true); T(doc._attachments["baz.txt"].stub == true); + TEquals("undefined", typeof doc._attachments["foo.txt"].encoding); + TEquals("undefined", typeof doc._attachments["bar.txt"].encoding); + TEquals("gzip", doc._attachments["baz.txt"].encoding); //lets change attachment bar delete doc._attachments["bar.txt"].stub; // remove stub member (or could set to false) diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl index 0dbebb6e..8336cac0 100644 --- a/src/couchdb/couch_httpd_db.erl +++ b/src/couchdb/couch_httpd_db.erl @@ -762,7 +762,7 @@ send_doc_efficiently(#httpd{mochi_req = MochiReq} = Req, true -> Boundary = couch_uuids:random(), JsonBytes = ?JSON_ENCODE(couch_doc:to_json_obj(Doc, - [attachments, follows|Options])), + [attachments, follows, att_encoding_info | Options])), {ContentType, Len} = couch_doc:len_doc_to_multi_part_stream( Boundary,JsonBytes, Atts, true), CType = {<<"Content-Type">>, ContentType}, |