@@ -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); }; share/www/script/test/attachments.js @@ -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; src/couchdb/couch_httpd_db.erl c3b964accf803e3fe48b45cea39a5c7d5ed2ad95 jchris jchris@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/halorgium/couchdb/commit/231b7396243c84656c9080adfde22313682dd7ac 231b7396243c84656c9080adfde22313682dd7ac 2009-07-09T18:17:15-07:00 2009-07-09T18:17:15-07:00 fix attachment etags, thanks Mark Hammond for the test case. closes COUCHDB-386 git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@792774 13f79535-47bb-0310-9956-ffa450edef68 b0f9422b6da1476a0662840608418dbe92a08872 jchris jchris@13f79535-47bb-0310-9956-ffa450edef68