diff options
| -rw-r--r-- | share/www/script/test/attachments.js | 9 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd_db.erl | 29 |
2 files changed, 25 insertions, 13 deletions
diff --git a/share/www/script/test/attachments.js b/share/www/script/test/attachments.js index 7204475f..5470840a 100644 --- a/share/www/script/test/attachments.js +++ b/share/www/script/test/attachments.js @@ -202,4 +202,13 @@ couchTests.attachments= function(debug) { var doc = db.open("bin_doc5", {attachments:true}); T(doc._attachments["lorem.txt"].data == lorem_b64); + // test etags for attachments. + var xhr = CouchDB.request("GET", "/test_suite_db/bin_doc5/lorem.txt"); + T(xhr.status == 200); + var etag = xhr.getResponseHeader("etag"); + console.log(etag) + xhr = CouchDB.request("GET", "/test_suite_db/bin_doc5/lorem.txt", { + headers: {"if-none-match": etag} + }); + T(xhr.status == 304); }; diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl index fcbdc4c6..3b5fcbe8 100644 --- a/src/couchdb/couch_httpd_db.erl +++ b/src/couchdb/couch_httpd_db.erl @@ -774,19 +774,22 @@ db_attachment_req(#httpd{method='GET'}=Req, Db, DocId, FileNameParts) -> undefined -> throw({not_found, "Document is missing attachment"}); {Type, Bin} -> - {ok, Resp} = start_chunked_response(Req, 200, [ - {"ETag", couch_httpd:doc_etag(Doc)}, - {"Cache-Control", "must-revalidate"}, - {"Content-Type", binary_to_list(Type)}%, - % My understanding of http://www.faqs.org/rfcs/rfc2616.html - % says that we should not use Content-Length with a chunked - % encoding. Turning this off makes libcurl happy, but I am - % open to discussion. - % {"Content-Length", integer_to_list(couch_doc:bin_size(Bin))} - ]), - couch_doc:bin_foldl(Bin, - fun(BinSegment, _) -> send_chunk(Resp, BinSegment) end,[]), - send_chunk(Resp, "") + Etag = couch_httpd:doc_etag(Doc), + couch_httpd:etag_respond(Req, Etag, fun() -> + {ok, Resp} = start_chunked_response(Req, 200, [ + {"ETag", Etag}, + {"Cache-Control", "must-revalidate"}, + {"Content-Type", binary_to_list(Type)}%, + % My understanding of http://www.faqs.org/rfcs/rfc2616.html + % says that we should not use Content-Length with a chunked + % encoding. Turning this off makes libcurl happy, but I am + % open to discussion. + % {"Content-Length", integer_to_list(couch_doc:bin_size(Bin))} + ]), + couch_doc:bin_foldl(Bin, + fun(BinSegment, _) -> send_chunk(Resp, BinSegment) end,[]), + send_chunk(Resp, "") + end) end; |