Allow storing attachments in compressed form. Closes COUCHDB-583. Thanks Filipe Manana

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@904650 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 1238 insertions, 95 deletions

diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 609d48f1..dcf4d0f3 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -107,3 +107,9 @@ rate = 1000
 ; sample intervals are in seconds
 samples = [0, 60, 300, 900]
 
+[attachments]
+compression_level = 8 ; from 1 (lowest, fastest) to 9 (highest, slowest), 0 to disable compression
+compressible_types = text/*
+ application/javascript
+ application/json
+ application/xml
diff --git a/src/couchdb/couch_config.erl b/src/couchdb/couch_config.erl
index d8473e08..1fe5aa0d 100644
--- a/src/couchdb/couch_config.erl
+++ b/src/couchdb/couch_config.erl
@@ -194,8 +194,28 @@ parse_ini_file(IniFile) ->
                 {AccSectionName, AccValues};
             Line2 ->
                 case re:split(Line2, "\s?=\s?", [{return, list}]) of
-                [_SingleElement] -> % no "=" found, ignore this line
-                    {AccSectionName, AccValues};
+                [Value] ->
+                    MultiLineValuePart = case re:run(Line, "^ \\S", []) of
+                    {match, _} ->
+                        true;
+                    _ ->
+                        false
+                    end,
+                    case {MultiLineValuePart, AccValues} of
+                    {true, [{{_, ValueName}, PrevValue} | AccValuesRest]} ->
+                        % remove comment
+                        case re:split(Value, " ;|\t;", [{return, list}]) of
+                        [[]] ->
+                            % empty line
+                            {AccSectionName, AccValues};
+                        [LineValue | _Rest] ->
+                            E = {{AccSectionName, ValueName},
+                                PrevValue ++ " " ++ LineValue},
+                            {AccSectionName, [E | AccValuesRest]}
+                        end;
+                    _ ->
+                        {AccSectionName, AccValues}
+                    end;
                 [""|_LineValues] -> % line begins with "=", ignore
                     {AccSectionName, AccValues};
                 [ValueName|LineValues] -> % yeehaw, got a line!
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl
index 79e00ff8..f4b024ad 100644
--- a/src/couchdb/couch_db.erl
+++ b/src/couchdb/couch_db.erl
@@ -694,17 +694,17 @@ flush_att(Fd, #att{data={Fd0, _}}=Att) when Fd0 == Fd ->
     Att;
 
 flush_att(Fd, #att{data={OtherFd,StreamPointer}, md5=InMd5}=Att) ->
-    {NewStreamData, Len, Md5} = 
+    {NewStreamData, Len, _IdentityLen, Md5, IdentityMd5} =
             couch_stream:copy_to_new_stream(OtherFd, StreamPointer, Fd),
-    check_md5(Md5, InMd5),
-    Att#att{data={Fd, NewStreamData}, md5=Md5, len=Len};
+    check_md5(IdentityMd5, InMd5),
+    Att#att{data={Fd, NewStreamData}, md5=Md5, att_len=Len, disk_len=Len};
 
 flush_att(Fd, #att{data=Data}=Att) when is_binary(Data) ->
     with_stream(Fd, Att, fun(OutputStream) ->
         couch_stream:write(OutputStream, Data)
     end);
 
-flush_att(Fd, #att{data=Fun,len=undefined}=Att) when is_function(Fun) ->
+flush_att(Fd, #att{data=Fun,att_len=undefined}=Att) when is_function(Fun) ->
     with_stream(Fd, Att, fun(OutputStream) ->
         % Fun(MaxChunkSize, WriterFun) must call WriterFun
         % once for each chunk of the attachment,
@@ -726,9 +726,9 @@ flush_att(Fd, #att{data=Fun,len=undefined}=Att) when is_function(Fun) ->
             end, ok)
     end);
 
-flush_att(Fd, #att{data=Fun,len=Len}=Att) when is_function(Fun) ->
+flush_att(Fd, #att{data=Fun,att_len=AttLen}=Att) when is_function(Fun) ->
     with_stream(Fd, Att, fun(OutputStream) ->
-        write_streamed_attachment(OutputStream, Fun, Len)
+        write_streamed_attachment(OutputStream, Fun, AttLen)
     end).
 
 % From RFC 2616 3.6.1 - Chunked Transfer Coding
@@ -741,8 +741,16 @@ flush_att(Fd, #att{data=Fun,len=Len}=Att) when is_function(Fun) ->
 % is present in the request, but there is no Content-MD5
 % trailer, we're free to ignore this inconsistency and
 % pretend that no Content-MD5 exists.
-with_stream(Fd, #att{md5=InMd5}=Att, Fun) ->
-    {ok, OutputStream} = couch_stream:open(Fd),
+with_stream(Fd, #att{md5=InMd5,type=Type}=Att, Fun) ->
+    {ok, OutputStream} = case couch_util:compressible_att_type(Type) of
+    true ->
+        CompLevel = list_to_integer(
+            couch_config:get("attachments", "compression_level", "0")
+        ),
+        couch_stream:open(Fd, CompLevel);
+    _ ->
+        couch_stream:open(Fd)
+    end,
     ReqMd5 = case Fun(OutputStream) of
         {md5, FooterMd5} ->
             case InMd5 of
@@ -752,9 +760,16 @@ with_stream(Fd, #att{md5=InMd5}=Att, Fun) ->
         _ ->
             InMd5
     end,
-    {StreamInfo, Len, Md5} = couch_stream:close(OutputStream),
-    check_md5(Md5, ReqMd5),
-    Att#att{data={Fd,StreamInfo},len=Len,md5=Md5}.
+    {StreamInfo, Len, IdentityLen, Md5, IdentityMd5} =
+        couch_stream:close(OutputStream),
+    check_md5(IdentityMd5, ReqMd5),
+    Att#att{
+        data={Fd,StreamInfo},
+        att_len=Len,
+        disk_len=IdentityLen,
+        md5=Md5,
+        comp=(IdentityMd5 =/= Md5)
+    }.
 
 
 write_streamed_attachment(_Stream, _F, 0) ->
@@ -983,17 +998,28 @@ make_doc(#db{fd=Fd}=Db, Id, Deleted, Bp, RevisionPath) ->
         {ok, {BodyData0, Atts0}} = read_doc(Db, Bp),
         {BodyData0,
             lists:map(
-                fun({Name,Type,Sp,Len,RevPos,Md5}) ->
+                fun({Name,Type,Sp,AttLen,DiskLen,RevPos,Md5,Comp}) ->
+                    #att{name=Name,
+                        type=Type,
+                        att_len=AttLen,
+                        disk_len=DiskLen,
+                        md5=Md5,
+                        revpos=RevPos,
+                        data={Fd,Sp},
+                        comp=Comp};
+                ({Name,Type,Sp,AttLen,RevPos,Md5}) ->
                     #att{name=Name,
                         type=Type,
-                        len=Len,
+                        att_len=AttLen,
+                        disk_len=AttLen,
                         md5=Md5,
                         revpos=RevPos,
                         data={Fd,Sp}};
-                ({Name,{Type,Sp,Len}}) ->
+                ({Name,{Type,Sp,AttLen}}) ->
                     #att{name=Name,
                         type=Type,
-                        len=Len,
+                        att_len=AttLen,
+                        disk_len=AttLen,
                         md5= <<>>,
                         revpos=0,
                         data={Fd,Sp}}
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl
index 17917312..31b66edb 100644
--- a/src/couchdb/couch_db.hrl
+++ b/src/couchdb/couch_db.hrl
@@ -99,10 +99,13 @@
     {
     name,
     type,
-    len,
+    att_len,
+    disk_len, % length of the attachment in uncompressed form
+              % differs from at_len when comp =:= true
     md5= <<>>,
     revpos=0,
-    data
+    data,
+    comp=false  % gzip compression Y/N
     }).
 
 
diff --git a/src/couchdb/couch_db_updater.erl b/src/couchdb/couch_db_updater.erl
index 7292221a..723fc11c 100644
--- a/src/couchdb/couch_db_updater.erl
+++ b/src/couchdb/couch_db_updater.erl
@@ -429,8 +429,9 @@ flush_trees(#db{fd=Fd,header=Header}=Db,
                 case Atts of
                 [] -> [];
                 [#att{data={BinFd, _Sp}} | _ ] when BinFd == Fd ->
-                    [{N,T,P,L,R,M}
-                        || #att{name=N,type=T,data={_,P},md5=M,revpos=R,len=L}
+                    [{N,T,P,AL,DL,R,M,C}
+                        || #att{name=N,type=T,data={_,P},md5=M,revpos=R,
+                               att_len=AL,disk_len=DL,comp=C}
                         <- Atts];
                 _ ->
                     % BinFd must not equal our Fd. This can happen when a database
@@ -696,21 +697,31 @@ copy_doc_attachments(#db{fd=SrcFd}=SrcDb, {Pos,_RevId}, SrcSp, DestFd) ->
     {ok, {BodyData, BinInfos}} = couch_db:read_doc(SrcDb, SrcSp),
     % copy the bin values
     NewBinInfos = lists:map(
-        fun({Name, {Type, BinSp, Len}}) when is_tuple(BinSp) orelse BinSp == null ->
+        fun({Name, {Type, BinSp, AttLen}}) when is_tuple(BinSp) orelse BinSp == null ->
             % 09 UPGRADE CODE
-            {NewBinSp, Len, Md5} = couch_stream:old_copy_to_new_stream(SrcFd, BinSp, Len, DestFd),
-            {Name, Type, NewBinSp, Len, Pos, Md5};
-        ({Name, {Type, BinSp, Len}}) ->
+            {NewBinSp, AttLen, AttLen, Md5, _IdentityMd5} =
+                couch_stream:old_copy_to_new_stream(SrcFd, BinSp, AttLen, DestFd),
+            {Name, Type, NewBinSp, AttLen, AttLen, Pos, Md5, false};
+        ({Name, {Type, BinSp, AttLen}}) ->
             % 09 UPGRADE CODE
-            {NewBinSp, Len, Md5} = couch_stream:copy_to_new_stream(SrcFd, BinSp, DestFd),
-            {Name, Type, NewBinSp, Len, Pos, Md5};
-        ({Name, Type, BinSp, Len, RevPos, <<>>}) when is_tuple(BinSp) orelse BinSp == null ->
+            {NewBinSp, AttLen, AttLen, Md5, _IdentityMd5} =
+                couch_stream:copy_to_new_stream(SrcFd, BinSp, DestFd),
+            {Name, Type, NewBinSp, AttLen, AttLen, Pos, Md5, false};
+        ({Name, Type, BinSp, AttLen, _RevPos, <<>>}) when
+            is_tuple(BinSp) orelse BinSp == null ->
             % 09 UPGRADE CODE
-            {NewBinSp, Len, Md5} = couch_stream:old_copy_to_new_stream(SrcFd, BinSp, Len, DestFd),
-            {Name, Type, NewBinSp, Len, Len, Md5};
-        ({Name, Type, BinSp, Len, RevPos, Md5}) ->
-            {NewBinSp, Len, Md5} = couch_stream:copy_to_new_stream(SrcFd, BinSp, DestFd),
-            {Name, Type, NewBinSp, Len, RevPos, Md5}
+            {NewBinSp, AttLen, AttLen, Md5, _IdentityMd5} =
+                couch_stream:old_copy_to_new_stream(SrcFd, BinSp, AttLen, DestFd),
+            {Name, Type, NewBinSp, AttLen, AttLen, AttLen, Md5, false};
+        ({Name, Type, BinSp, AttLen, RevPos, Md5}) ->
+            % 010 UPGRADE CODE
+            {NewBinSp, AttLen, AttLen, Md5, _IdentityMd5} =
+                couch_stream:copy_to_new_stream(SrcFd, BinSp, DestFd),
+            {Name, Type, NewBinSp, AttLen, AttLen, RevPos, Md5, false};
+        ({Name, Type, BinSp, AttLen, DiskLen, RevPos, Md5, Comp}) ->
+            {NewBinSp, AttLen, _, Md5, _IdentityMd5} =
+                couch_stream:copy_to_new_stream(SrcFd, BinSp, DestFd),
+            {Name, Type, NewBinSp, AttLen, DiskLen, RevPos, Md5, Comp}
         end, BinInfos),
     {BodyData, NewBinInfos}.
 
diff --git a/src/couchdb/couch_doc.erl b/src/couchdb/couch_doc.erl
index ba5c7450..48ed1530 100644
--- a/src/couchdb/couch_doc.erl
+++ b/src/couchdb/couch_doc.erl
@@ -13,7 +13,7 @@
 -module(couch_doc).
 
 -export([to_doc_info/1,to_doc_info_path/1,parse_rev/1,parse_revs/1,rev_to_str/1,revs_to_strs/1]).
--export([att_foldl/3,get_validate_doc_fun/1]).
+-export([att_foldl/3,att_foldl_unzip/3,get_validate_doc_fun/1]).
 -export([from_json_obj/1,to_json_obj/2,has_stubs/1, merge_stubs/2]).
 -export([validate_docid/1]).
 -export([doc_from_multi_part_stream/2]).
@@ -87,20 +87,26 @@ to_json_attachments([], _RevPosIncludeAfter, _DataToFollow) ->
     [];
 to_json_attachments(Atts, RevPosIncludeAfter, DataToFollow) ->
     AttProps = lists:map(
-        fun(#att{len=Len}=Att) ->
+        fun(#att{disk_len=DiskLen}=Att) ->
             {Att#att.name, {[
                 {<<"content_type">>, Att#att.type},
                 {<<"revpos">>, Att#att.revpos}
                 ] ++
                 if Att#att.revpos > RevPosIncludeAfter ->    
                     if DataToFollow ->
-                        [{<<"length">>, Len}, {<<"follows">>, true}];
+                        [{<<"length">>, DiskLen}, {<<"follows">>, true}];
                     true ->
+                        AttData = case Att#att.comp of
+                        true ->
+                            zlib:gunzip(att_to_iolist(Att));
+                        _ ->
+                            att_to_iolist(Att)
+                        end,
                         [{<<"data">>, 
-                            couch_util:encodeBase64(att_to_iolist(Att))}]
+                            couch_util:encodeBase64(AttData)}]
                     end;
                 true ->
-                    [{<<"length">>, Len}, {<<"stub">>, true}]
+                    [{<<"length">>, DiskLen}, {<<"stub">>, true}]
                 end
             }}
         end, Atts),
@@ -187,21 +193,23 @@ transfer_fields([{<<"_attachments">>, {JsonBins}} | Rest], Doc) ->
             Type = proplists:get_value(<<"content_type">>, BinProps),
             Length = proplists:get_value(<<"length">>, BinProps),
             RevPos = proplists:get_value(<<"revpos">>, BinProps, 0),
-            #att{name=Name, data=stub, type=Type, len=Length, revpos=RevPos};
+            #att{name=Name, data=stub, type=Type, att_len=Length,
+                disk_len=Length, revpos=RevPos};
         _ ->
             Type = proplists:get_value(<<"content_type">>, BinProps,
                     ?DEFAULT_ATTACHMENT_CONTENT_TYPE),
             RevPos = proplists:get_value(<<"revpos">>, BinProps, 0),
             case proplists:get_value(<<"follows">>, BinProps) of
             true ->
+                Len = proplists:get_value(<<"length">>, BinProps),
                 #att{name=Name, data=follows, type=Type, 
-                    len=proplists:get_value(<<"length">>, BinProps),
-                        revpos=RevPos};
+                    att_len=Len, disk_len=Len, revpos=RevPos};
             _ ->
                 Value = proplists:get_value(<<"data">>, BinProps),
                 Bin = couch_util:decodeBase64(Value),
-                #att{name=Name, data=Bin, type=Type, len=size(Bin),
-                        revpos=RevPos}
+                LenBin = size(Bin),
+                #att{name=Name, data=Bin, type=Type, att_len=LenBin,
+                        disk_len=LenBin, revpos=RevPos}
             end
         end
     end, JsonBins),
@@ -272,14 +280,16 @@ to_doc_info_path(#full_doc_info{id=Id,rev_tree=Tree}) ->
 
 att_foldl(#att{data=Bin}, Fun, Acc) when is_binary(Bin) ->
     Fun(Bin, Acc);
-att_foldl(#att{data={Fd,Sp},len=Len}, Fun, Acc) when is_tuple(Sp) orelse Sp == null ->
+att_foldl(#att{data={Fd,Sp},att_len=Len}, Fun, Acc) when is_tuple(Sp) orelse Sp == null ->
     % 09 UPGRADE CODE
     couch_stream:old_foldl(Fd, Sp, Len, Fun, Acc);
 att_foldl(#att{data={Fd,Sp},md5=Md5}, Fun, Acc) ->
     couch_stream:foldl(Fd, Sp, Md5, Fun, Acc);
-att_foldl(#att{data=DataFun,len=Len}, Fun, Acc) when is_function(DataFun) ->
+att_foldl(#att{data=DataFun,att_len=Len}, Fun, Acc) when is_function(DataFun) ->
    fold_streamed_data(DataFun, Len, Fun, Acc).
 
+att_foldl_unzip(#att{data={Fd,Sp},md5=Md5}, Fun, Acc) ->
+    couch_stream:foldl_unzip(Fd, Sp, Md5, Fun, Acc).
 
 att_to_iolist(#att{data=Bin}) when is_binary(Bin) ->
     Bin;
@@ -288,7 +298,7 @@ att_to_iolist(#att{data=Iolist}) when is_list(Iolist) ->
 att_to_iolist(#att{data={Fd,Sp}}=Att) ->
     lists:reverse(att_foldl(Att,
         fun(Bin,Acc) -> [Bin|Acc] end, []));
-att_to_iolist(#att{data=DataFun, len=Len}) when is_function(DataFun)->
+att_to_iolist(#att{data=DataFun, att_len=Len}) when is_function(DataFun)->
     lists:reverse(fold_streamed_data(DataFun, Len,
             fun(Data, Acc) -> [Data | Acc] end, [])).
 
@@ -342,11 +352,11 @@ len_doc_to_multi_part_stream(Boundary,JsonBytes,Atts,AttsSinceRevPos) ->
     iolist_size(JsonBytes) +
     4 + % "\r\n--"
     size(Boundary) +
-    + lists:foldl(fun(#att{revpos=RevPos,len=Len}, AccAttsSize) ->
+    + lists:foldl(fun(#att{revpos=RevPos,disk_len=DiskLen}, AccAttsSize) ->
             if RevPos > AttsSinceRevPos ->
                 AccAttsSize +  
                 4 + % "\r\n\r\n"
-                Len +
+                DiskLen +
                 4 + % "\r\n--"
                 size(Boundary);
             true ->
@@ -366,7 +376,13 @@ atts_to_mp([], _Boundary, WriteFun, _AttsSinceRevPos) ->
 atts_to_mp([#att{revpos=RevPos} = Att | RestAtts], Boundary, WriteFun, 
         AttsSinceRevPos) when RevPos > AttsSinceRevPos ->
     WriteFun(<<"\r\n\r\n">>),
-    att_foldl(Att, fun(Data, ok) -> WriteFun(Data) end, ok),
+    AttFun = case Att#att.comp of
+    true ->
+        fun att_foldl_unzip/3;
+    _ ->
+        fun att_foldl/3
+    end,
+    AttFun(Att, fun(Data, ok) -> WriteFun(Data) end, ok),
     WriteFun(<<"\r\n--", Boundary/binary>>),
     atts_to_mp(RestAtts, Boundary, WriteFun, AttsSinceRevPos);
 atts_to_mp([_ | RestAtts], Boundary, WriteFun, AttsSinceRevPos) ->
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 68478f4d..a36782db 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -25,6 +25,7 @@
 -export([start_json_response/2, start_json_response/3, end_json_response/1]).
 -export([send_response/4,send_method_not_allowed/2,send_error/4, send_redirect/2,send_chunked_error/2]).
 -export([send_json/2,send_json/3,send_json/4,last_chunk/1,parse_multipart_request/3]).
+-export([accepted_encodings/1]).
 
 start_link() ->
     % read config and register for configuration changes
@@ -193,6 +194,12 @@ handle_request(MochiReq, DefaultFun,
         throw:{invalid_json, S} ->
             ?LOG_ERROR("attempted upload of invalid JSON ~s", [S]),
             send_error(HttpReq, {bad_request, "invalid UTF-8 JSON"});
+        throw:unacceptable_encoding ->
+            ?LOG_ERROR("unsupported encoding method for the response", []),
+            send_error(HttpReq, {not_acceptable, "unsupported encoding"});
+        throw:bad_accept_encoding_value ->
+            ?LOG_ERROR("received invalid Accept-Encoding header", []),
+            send_error(HttpReq, bad_request);
         exit:normal ->
             exit(normal);
         throw:Error ->
@@ -261,6 +268,16 @@ header_value(#httpd{mochi_req=MochiReq}, Key, Default) ->
 primary_header_value(#httpd{mochi_req=MochiReq}, Key) ->
     MochiReq:get_primary_header_value(Key).
 
+accepted_encodings(#httpd{mochi_req=MochiReq}) ->
+    case MochiReq:accepted_encodings(["gzip", "identity"]) of
+    bad_accept_encoding_value ->
+        throw(bad_accept_encoding_value);
+    [] ->
+        throw(unacceptable_encoding);
+    EncList ->
+        EncList
+    end.
+
 serve_file(#httpd{mochi_req=MochiReq}=Req, RelativePath, DocumentRoot) ->
     serve_file(Req, RelativePath, DocumentRoot, []).
 
diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl
index dd13cb59..fd143fa1 100644
--- a/src/couchdb/couch_httpd_db.erl
+++ b/src/couchdb/couch_httpd_db.erl
@@ -21,7 +21,7 @@
 -import(couch_httpd,
     [send_json/2,send_json/3,send_json/4,send_method_not_allowed/2,
     start_json_response/2,start_json_response/3,
-    send_chunk/2,end_json_response/1,
+    send_chunk/2,last_chunk/1,end_json_response/1,
     start_chunked_response/3, absolute_uri/2, send/2,
     start_response_length/4]).
 
@@ -993,20 +993,37 @@ db_attachment_req(#httpd{method='GET'}=Req, Db, DocId, FileNameParts) ->
     case [A || A <- Atts, A#att.name == FileName] of
     [] ->
         throw({not_found, "Document is missing attachment"});
-    [#att{type=Type, len=Len}=Att] ->
+    [#att{type=Type, comp=Comp}=Att] ->
         Etag = couch_httpd:doc_etag(Doc),
-        couch_httpd:etag_respond(Req, Etag, fun() ->
-            {ok, Resp} = start_response_length(Req, 200, [
-                {"ETag", Etag},
-                {"Cache-Control", "must-revalidate"},
-                {"Content-Type", binary_to_list(Type)}
-                ], integer_to_list(Len)),
-            couch_doc:att_foldl(
-                Att,
-                fun(BinSegment, _) -> send(Resp, BinSegment) end,
-                {ok, Resp} % Seed in case of 0 byte attachment.
-            )
-        end)
+        ReqAcceptsGzip = lists:member(
+           "gzip",
+           couch_httpd:accepted_encodings(Req)
+        ),
+        Headers = [
+            {"ETag", Etag},
+            {"Cache-Control", "must-revalidate"},
+            {"Content-Type", binary_to_list(Type)}
+        ] ++ case {Comp, ReqAcceptsGzip} of
+        {true, true} ->
+            [{"Content-Encoding", "gzip"}];
+        _ ->
+            []
+        end,
+        AttFun = case {Comp, ReqAcceptsGzip} of
+        {true, false} ->
+            fun couch_doc:att_foldl_unzip/3;
+        _ ->
+            fun couch_doc:att_foldl/3
+        end,
+        couch_httpd:etag_respond(
+            Req,
+            Etag,
+            fun() ->
+                {ok, Resp} = start_chunked_response(Req, 200, Headers),
+                AttFun(Att, fun(Seg, _) -> send_chunk(Resp, Seg) end, ok),
+                last_chunk(Resp)
+            end
+        )
     end;
 
 
@@ -1048,7 +1065,7 @@ db_attachment_req(#httpd{method=Method}=Req, Db, DocId, FileNameParts)
                     Length ->
                         exit({length_not_integer, Length})
                     end,
-                len = case couch_httpd:header_value(Req,"Content-Length") of
+                att_len = case couch_httpd:header_value(Req,"Content-Length") of
                     undefined ->
                         undefined;
                     Length ->
diff --git a/src/couchdb/couch_stream.erl b/src/couchdb/couch_stream.erl
index 2a873e4c..cdbbe552 100644
--- a/src/couchdb/couch_stream.erl
+++ b/src/couchdb/couch_stream.erl
@@ -24,7 +24,7 @@
 
 -define(DEFAULT_STREAM_CHUNK, 16#00100000). % 1 meg chunks when streaming data
 
--export([open/1, close/1, write/2, foldl/4, foldl/5, 
+-export([open/1, open/2, close/1, write/2, foldl/4, foldl/5, foldl_unzip/5,
         old_foldl/5,old_copy_to_new_stream/4]).
 -export([copy_to_new_stream/3,old_read_term/2]).
 -export([init/1, terminate/2, handle_call/3]).
@@ -39,14 +39,22 @@
     buffer_len = 0,
     max_buffer = 4096,
     written_len = 0,
-    md5
+    md5,
+    % md5 of the content without any transformation applied (e.g. compression)
+    % needed for the attachment upload integrity check (ticket 558)
+    identity_md5,
+    identity_len = 0,
+    zstream
     }).
 
 
 %%% Interface functions %%%
 
 open(Fd) ->
-    gen_server:start_link(couch_stream, Fd, []).
+    open(Fd, 0).
+
+open(Fd, CompressionLevel) ->
+    gen_server:start_link(couch_stream, {Fd, CompressionLevel}, []).
 
 close(Pid) ->
     gen_server:call(Pid, close, infinity).
@@ -82,11 +90,31 @@ foldl(Fd, [Pos|Rest], Fun, Acc) ->
     {ok, Bin} = couch_file:pread_iolist(Fd, Pos),
     foldl(Fd, Rest, Fun, Fun(Bin, Acc)).
 
+foldl_unzip(Fd, PosList, Fun, Acc) ->
+    Z = unzip_init(),
+    Result = do_foldl_unzip(Z, Fd, PosList, Fun, Acc),
+    unzip_end(Z),
+    Result.
+
+do_foldl_unzip(_Z, _Fd, [], _Fun, Acc) ->
+    Acc;
+do_foldl_unzip(Z, Fd, [Pos|Rest], Fun, Acc) ->
+    {ok, BinZip} = couch_file:pread_iolist(Fd, Pos),
+    Bin = zlib:inflate(Z, BinZip),
+    do_foldl_unzip(Z, Fd, Rest, Fun, Fun(Bin, Acc)).
+
 foldl(Fd, PosList, <<>>, Fun, Acc) ->
     foldl(Fd, PosList, Fun, Acc);
 foldl(Fd, PosList, Md5, Fun, Acc) ->
     foldl(Fd, PosList, Md5, erlang:md5_init(), Fun, Acc).
 
+foldl_unzip(Fd, PosList, <<>>, Fun, Acc) ->
+    foldl_unzip(Fd, PosList, Fun, Acc);
+foldl_unzip(Fd, PosList, Md5, Fun, Acc) ->
+    Z = unzip_init(),
+    Result = foldl_unzip(Z, Fd, PosList, Md5, erlang:md5_init(), Fun, Acc),
+    unzip_end(Z),
+    Result.
 
 foldl(_Fd, [], Md5, Md5Acc, _Fun, Acc) ->
     Md5 = erlang:md5_final(Md5Acc),
@@ -99,14 +127,62 @@ foldl(Fd, [Pos|Rest], Md5, Md5Acc, Fun, Acc) ->
     {ok, Bin} = couch_file:pread_iolist(Fd, Pos),
     foldl(Fd, Rest, Md5, erlang:md5_update(Md5Acc, Bin), Fun, Fun(Bin, Acc)).
 
+foldl_unzip(_Z, _Fd, [], Md5, Md5Acc, _Fun, Acc) ->
+    Md5 = erlang:md5_final(Md5Acc),
+    Acc;
+foldl_unzip(Z, Fd, [Pos], Md5, Md5Acc, Fun, Acc) ->
+    {ok, BinZip} = couch_file:pread_iolist(Fd, Pos),
+    Md5 = erlang:md5_final(erlang:md5_update(Md5Acc, BinZip)),
+    Bin = zlib:inflate(Z, BinZip),
+    Fun(Bin, Acc);
+foldl_unzip(Z, Fd, [Pos|Rest], Md5, Md5Acc, Fun, Acc) ->
+    {ok, BinZip} = couch_file:pread_iolist(Fd, Pos),
+    Bin = zlib:inflate(Z, BinZip),
+    Md5Acc2 = erlang:md5_update(Md5Acc, BinZip),
+    foldl_unzip(Z, Fd, Rest, Md5, Md5Acc2, Fun, Fun(Bin, Acc)).
+
+zip_init(CompressionLevel) ->
+    Z = zlib:open(),
+    % 15 = ?MAX_WBITS (defined in the zlib module)
+    % the 16 + ?MAX_WBITS formula was obtained by inspecting zlib:gzip/1
+    zlib:deflateInit(Z, CompressionLevel, deflated, 16 + 15, 8, default),
+    Z.
+
+zip_end(Z, Data) ->
+    Last = zlib:deflate(Z, Data, finish),
+    zlib:deflateEnd(Z),
+    zlib:close(Z),
+    Last.
+
+unzip_init() ->
+    Z = zlib:open(),
+    zlib:inflateInit(Z, 16 + 15),
+    Z.
+
+unzip_end(Z) ->
+    zlib:inflateEnd(Z),
+    zlib:close(Z).
+
 write(_Pid, <<>>) ->
     ok;
 write(Pid, Bin) ->
     gen_server:call(Pid, {write, Bin}, infinity).
 
 
-init(Fd) ->
-    {ok, #stream{fd=Fd, md5=erlang:md5_init()}}.
+init({Fd, CompressionLevel}) ->
+    Z = case CompressionLevel >= 1 andalso CompressionLevel =< 9 of
+    true ->
+        zip_init(CompressionLevel);
+    _ ->
+        undefined
+    end,
+    {ok, #stream{
+            fd=Fd,
+            md5=erlang:md5_init(),
+            identity_md5=erlang:md5_init(),
+            zstream=Z
+        }
+    }.
 
 terminate(_Reason, _Stream) ->
     ok.
@@ -120,39 +196,74 @@ handle_call({write, Bin}, _From, Stream) ->
         buffer_len = BufferLen,
         buffer_list = Buffer,
         max_buffer = Max,
-        md5 = Md5} = Stream,
+        md5 = Md5,
+        identity_md5 = IdenMd5,
+        identity_len = IdenLen,
+        zstream = Z} = Stream,
     if BinSize + BufferLen > Max ->
         WriteBin = lists:reverse(Buffer, [Bin]),
-        Md5_2 = erlang:md5_update(Md5, WriteBin),
-        {ok, Pos} = couch_file:append_binary(Fd, WriteBin),
+        IdenMd5_2 = erlang:md5_update(IdenMd5, WriteBin),
+        WriteBin2 = case Z of
+        undefined ->
+            WriteBin;
+        _ ->
+            zlib:deflate(Z, WriteBin)
+        end,
+        case WriteBin2 of
+        [] ->
+            % case where zlib did some internal buffering
+            WrittenLen2 = WrittenLen,
+            Md5_2 = Md5,
+            Written2 = Written;
+        _ ->
+            {ok, Pos} = couch_file:append_binary(Fd, WriteBin2),
+            WrittenLen2 = WrittenLen + iolist_size(WriteBin2),
+            Md5_2 = erlang:md5_update(Md5, WriteBin2),
+            Written2 = [Pos|Written]
+        end,
+
         {reply, ok, Stream#stream{
-                        written_len=WrittenLen + BufferLen + BinSize,
-                        written_pointers=[Pos|Written],
+                        written_len=WrittenLen2,
+                        written_pointers=Written2,
                         buffer_list=[],
                         buffer_len=0,
-                        md5=Md5_2}};
+                        md5=Md5_2,
+                        identity_md5=IdenMd5_2,
+                        identity_len=IdenLen + BinSize}};
     true ->
         {reply, ok, Stream#stream{
                         buffer_list=[Bin|Buffer],
-                        buffer_len=BufferLen + BinSize}}
+                        buffer_len=BufferLen + BinSize,
+                        identity_len=IdenLen + BinSize}}
     end;
 handle_call(close, _From, Stream) ->
     #stream{
         fd = Fd,
         written_len = WrittenLen,
         written_pointers = Written,
-        buffer_len = BufferLen,
         buffer_list = Buffer,
-        md5 = Md5} = Stream,
-
-    case Buffer of
+        md5 = Md5,
+        identity_md5 = IdenMd5,
+        identity_len = IdenLen,
+        zstream = Z} = Stream,
+
+    WriteBin = lists:reverse(Buffer),
+    IdenMd5Final = erlang:md5_final(erlang:md5_update(IdenMd5, WriteBin)),
+    WriteBin2 = case Z of
+    undefined ->
+        WriteBin;
+    _ ->
+        zip_end(Z, WriteBin)
+    end,
+    Md5Final = erlang:md5_final(erlang:md5_update(Md5, WriteBin2)),
+    Result = case WriteBin2 of
     [] ->
-        Result = {lists:reverse(Written), WrittenLen, erlang:md5_final(Md5)};
+        {lists:reverse(Written), WrittenLen, IdenLen, Md5Final, IdenMd5Final};
     _ ->
-        WriteBin = lists:reverse(Buffer),
-        Md5Final = erlang:md5_final(erlang:md5_update(Md5, WriteBin)),
-        {ok, Pos} = couch_file:append_binary(Fd, WriteBin),
-        Result = {lists:reverse(Written, [Pos]), WrittenLen + BufferLen, Md5Final}
+        {ok, Pos} = couch_file:append_binary(Fd, WriteBin2),
+        StreamInfo = lists:reverse(Written, [Pos]),
+        StreamLen = WrittenLen + iolist_size(WriteBin2),
+        {StreamInfo, StreamLen, IdenLen, Md5Final, IdenMd5Final}
     end,
     {stop, normal, Result, Stream}.
 
diff --git a/src/couchdb/couch_util.erl b/src/couchdb/couch_util.erl
index 45d1d336..ca36a6db 100644
--- a/src/couchdb/couch_util.erl
+++ b/src/couchdb/couch_util.erl
@@ -22,6 +22,7 @@
 -export([to_binary/1, to_integer/1, to_list/1, url_encode/1]).
 -export([json_encode/1, json_decode/1]).
 -export([verify/2]).
+-export([compressible_att_type/1]).
 
 -include("couch_db.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -440,3 +441,25 @@ verify(X, Y) when is_list(X) and is_list(Y) ->
             false
     end;
 verify(_X, _Y) -> false.
+
+compressible_att_type(MimeType) when is_binary(MimeType) ->
+    compressible_att_type(?b2l(MimeType));
+compressible_att_type(MimeType) ->
+    TypeExpList = re:split(
+        couch_config:get("attachments", "compressible_types", ""),
+        "\\s+",
+        [{return, list}]
+    ),
+    lists:any(
+        fun(TypeExp) ->
+            Regexp = "^\\s*" ++
+                re:replace(TypeExp, "\\*", ".*", [{return, list}]) ++ "\\s*$",
+            case re:run(MimeType, Regexp, [caseless]) of
+            {match, _} ->
+                true;
+            _ ->
+                false
+            end
+        end,
+        [T || T <- TypeExpList, T /= []]
+    ).
diff --git a/src/mochiweb/mochiweb_request.erl b/src/mochiweb/mochiweb_request.erl
index fc296f40..5d7af26b 100644
--- a/src/mochiweb/mochiweb_request.erl
+++ b/src/mochiweb/mochiweb_request.erl
@@ -20,6 +20,7 @@
 -export([should_close/0, cleanup/0]).
 -export([parse_cookie/0, get_cookie_value/1]).
 -export([serve_file/2, serve_file/3]).
+-export([accepted_encodings/1]).
 -export([test/0]).
 
 -define(SAVE_QS, mochiweb_request_qs).
@@ -730,6 +731,46 @@ parse_range_request(RawRange) when is_list(RawRange) ->
             fail
     end.
 
+%% @spec accepted_encodings([encoding()]) -> [encoding()] | error()
+%% @type encoding() -> string()
+%% @type error() -> bad_accept_encoding_value
+%%
+%% @doc Returns a list of encodings accepted by a request. Encodings that are
+%%      not supported by the server will not be included in the return list.
+%%      This list is computed from the "Accept-Encoding" header and
+%%      its elements are ordered, descendingly, according to their Q values.
+%%
+%%      Section 14.3 of the RFC 2616 (HTTP 1.1) describes the "Accept-Encoding"
+%%      header and the process of determining which server supported encodings
+%%      can be used for encoding the body for the request's response.
+%%
+%%      Examples
+%%
+%%      1) For a missing "Accept-Encoding" header:
+%%         accepted_encodings(["gzip", "identity"]) -> ["identity"]
+%%
+%%      2) For an "Accept-Encoding" header with value "gzip, deflate":
+%%         accepted_encodings(["gzip", "identity"]) -> ["gzip", "identity"]
+%%
+%%      3) For an "Accept-Encoding" header with value "gzip;q=0.5, deflate":
+%%         accepted_encodings(["gzip", "deflate", "identity"]) ->
+%%            ["deflate", "gzip", "identity"]
+%%
+accepted_encodings(SupportedEncodings) ->
+    AcceptEncodingHeader = case get_header_value("Accept-Encoding") of
+        undefined ->
+            "";
+        Value ->
+            Value
+    end,
+    case mochiweb_util:parse_qvalues(AcceptEncodingHeader) of
+        invalid_qvalue_string ->
+            bad_accept_encoding_value;
+        QList ->
+            mochiweb_util:pick_accepted_encodings(
+                QList, SupportedEncodings, "identity"
+            )
+    end.
 
 test() ->
     ok = test_range(),
diff --git a/src/mochiweb/mochiweb_util.erl b/src/mochiweb/mochiweb_util.erl
index 73cacea4..d8fc89d5 100644
--- a/src/mochiweb/mochiweb_util.erl
+++ b/src/mochiweb/mochiweb_util.erl
@@ -12,6 +12,7 @@
 -export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2]).
 -export([record_to_proplist/2, record_to_proplist/3]).
 -export([safe_relative_path/1, partition/2]).
+-export([parse_qvalues/1, pick_accepted_encodings/3]).
 -export([test/0]).
 
 -define(PERCENT, 37).  % $\%
@@ -435,6 +436,136 @@ shell_quote([C | Rest], Acc) when C =:= $\" orelse C =:= $\` orelse
 shell_quote([C | Rest], Acc) ->
     shell_quote(Rest, [C | Acc]).
 
+%% @spec parse_qvalues(string()) -> [qvalue()] | error()
+%% @type qvalue() -> {element(), q()}
+%% @type element() -> string()
+%% @type q() -> 0.0 .. 1.0
+%% @type error() -> invalid_qvalue_string
+%%
+%% @doc Parses a list (given as a string) of elements with Q values associated
+%%      to them. Elements are separated by commas and each element is separated
+%%      from its Q value by a semicolon. Q values are optional but when missing
+%%      the value of an element is considered as 1.0. A Q value is always in the
+%%      range [0.0, 1.0]. A Q value list is used for example as the value of the
+%%      HTTP "Accept-Encoding" header.
+%%
+%%      Q values are described in section 2.9 of the RFC 2616 (HTTP 1.1).
+%%
+%%      Example:
+%%
+%%      parse_qvalues("gzip; q=0.5, deflate, identity;q=0.0") ->
+%%          [{"gzip", 0.5}, {"deflate", 1.0}, {"identity", 0.0}]
+%%
+parse_qvalues(QValuesStr) ->
+    try
+        {ok, Re} = re:compile("^\\s*q\\s*=\\s*((?:0|1)(?:\\.\\d{1,3})?)\\s*$"),
+        lists:map(
+            fun(Pair) ->
+                case string:tokens(Pair, ";") of
+                    [Enc] ->
+                        {string:strip(Enc), 1.0};
+                    [Enc, QStr] ->
+                        case re:run(QStr, Re, [{capture, [1], list}]) of
+                            {match, [Q]} ->
+                                QVal = case Q of
+                                    "0" ->
+                                        0.0;
+                                    "1" ->
+                                        1.0;
+                                    Else ->
+                                        list_to_float(Else)
+                                end,
+                                case QVal < 0.0 orelse QVal > 1.0 of
+                                    false ->
+                                        {string:strip(Enc), QVal}
+                                end
+                        end
+                end
+            end,
+            string:tokens(string:to_lower(QValuesStr), ",")
+        )
+    catch
+        _Type:_Error ->
+            invalid_qvalue_string
+    end.
+
+%% @spec pick_accepted_encodings(qvalues(), [encoding()], encoding()) ->
+%%    [encoding()]
+%% @type qvalues() -> [ {encoding(), q()} ]
+%% @type encoding() -> string()
+%% @type q() -> 0.0 .. 1.0
+%%
+%% @doc Determines which encodings specified in the given Q values list are
+%%      valid according to a list of supported encodings and a default encoding.
+%%
+%%      The returned list of encodings is sorted, descendingly, according to the
+%%      Q values of the given list. The last element of this list is the given
+%%      default encoding unless this encoding is explicitily or implicitily
+%%      marked with a Q value of 0.0 in the given Q values list.
+%%      Note: encodings with the same Q value are kept in the same order as
+%%            found in the input Q values list.
+%%
+%%      This encoding picking process is described in section 14.3 of the
+%%      RFC 2616 (HTTP 1.1).
+%%
+%%      Example:
+%%
+%%      pick_accepted_encodings(
+%%          [{"gzip", 0.5}, {"deflate", 1.0}],
+%%          ["gzip", "identity"],
+%%          "identity"
+%%      ) ->
+%%          ["gzip", "identity"]
+%%
+pick_accepted_encodings(AcceptedEncs, SupportedEncs, DefaultEnc) ->
+    SortedQList = lists:reverse(
+        lists:sort(fun({_, Q1}, {_, Q2}) -> Q1 < Q2 end, AcceptedEncs)
+    ),
+    {Accepted, Refused} = lists:foldr(
+        fun({E, Q}, {A, R}) ->
+            case Q > 0.0 of
+                true ->
+                    {[E | A], R};
+                false ->
+                    {A, [E | R]}
+            end
+        end,
+        {[], []},
+        SortedQList
+    ),
+    Refused1 = lists:foldr(
+        fun(Enc, Acc) ->
+            case Enc of
+                "*" ->
+                    lists:subtract(SupportedEncs, Accepted) ++ Acc;
+                _ ->
+                    [Enc | Acc]
+            end
+        end,
+        [],
+        Refused
+    ),
+    Accepted1 = lists:foldr(
+        fun(Enc, Acc) ->
+            case Enc of
+                "*" ->
+                    lists:subtract(SupportedEncs, Accepted ++ Refused1) ++ Acc;
+                _ ->
+                    [Enc | Acc]
+            end
+        end,
+        [],
+        Accepted
+    ),
+    Accepted2 = case lists:member(DefaultEnc, Accepted1) of
+        true ->
+            Accepted1;
+        false ->
+            Accepted1 ++ [DefaultEnc]
+    end,
+    [E || E <- Accepted2, lists:member(E, SupportedEncs),
+        not lists:member(E, Refused1)].
+
 test() ->
     test_join(),
     test_quote_plus(),
@@ -453,6 +584,8 @@ test() ->
     test_cmd_string(),
     test_partition(),
     test_safe_relative_path(),
+    test_parse_qvalues(),
+    test_pick_accepted_encodings(),
     ok.
 
 test_shell_quote() ->
@@ -575,3 +708,152 @@ test_safe_relative_path() ->
     undefined = safe_relative_path("foo/../.."),
     undefined = safe_relative_path("foo//"),
     ok.
+
+test_parse_qvalues() ->
+    [] = parse_qvalues(""),
+    [{"identity", 0.0}] = parse_qvalues("identity;q=0"),
+    [{"identity", 0.0}] = parse_qvalues("identity ;q=0"),
+    [{"identity", 0.0}] = parse_qvalues(" identity; q =0 "),
+    [{"identity", 0.0}] = parse_qvalues("identity ; q = 0"),
+    [{"identity", 0.0}] = parse_qvalues("identity ; q= 0.0"),
+    [{"gzip", 1.0}, {"deflate", 1.0}, {"identity", 0.0}] = parse_qvalues(
+        "gzip,deflate,identity;q=0.0"
+    ),
+    [{"deflate", 1.0}, {"gzip", 1.0}, {"identity", 0.0}] = parse_qvalues(
+        "deflate,gzip,identity;q=0.0"
+    ),
+    [{"gzip", 1.0}, {"deflate", 1.0}, {"gzip", 1.0}, {"identity", 0.0}] =
+        parse_qvalues("gzip,deflate,gzip,identity;q=0"),
+    [{"gzip", 1.0}, {"deflate", 1.0}, {"identity", 0.0}] = parse_qvalues(
+        "gzip, deflate , identity; q=0.0"
+    ),
+    [{"gzip", 1.0}, {"deflate", 1.0}, {"identity", 0.0}] = parse_qvalues(
+        "gzip; q=1, deflate;q=1.0, identity;q=0.0"
+    ),
+    [{"gzip", 0.5}, {"deflate", 1.0}, {"identity", 0.0}] = parse_qvalues(
+        "gzip; q=0.5, deflate;q=1.0, identity;q=0"
+    ),
+    [{"gzip", 0.5}, {"deflate", 1.0}, {"identity", 0.0}] = parse_qvalues(
+        "gzip; q=0.5, deflate , identity;q=0.0"
+    ),
+    [{"gzip", 0.5}, {"deflate", 0.8}, {"identity", 0.0}] = parse_qvalues(
+        "gzip; q=0.5, deflate;q=0.8, identity;q=0.0"
+    ),
+    [{"gzip", 0.5}, {"deflate", 1.0}, {"identity", 1.0}] = parse_qvalues(
+        "gzip; q=0.5,deflate,identity"
+    ),
+    [{"gzip", 0.5}, {"deflate", 1.0}, {"identity", 1.0}, {"identity", 1.0}] =
+        parse_qvalues("gzip; q=0.5,deflate,identity, identity "),
+    invalid_qvalue_string = parse_qvalues("gzip; q=1.1, deflate"),
+    invalid_qvalue_string = parse_qvalues("gzip; q=0.5, deflate;q=2"),
+    invalid_qvalue_string = parse_qvalues("gzip, deflate;q=AB"),
+    invalid_qvalue_string = parse_qvalues("gzip; q=2.1, deflate"),
+    ok.
+
+test_pick_accepted_encodings() ->
+    ["identity"] = pick_accepted_encodings(
+        [],
+        ["gzip", "identity"],
+        "identity"
+    ),
+    ["gzip", "identity"] = pick_accepted_encodings(
+        [{"gzip", 1.0}],
+        ["gzip", "identity"],
+        "identity"
+    ),
+    ["identity"] = pick_accepted_encodings(
+        [{"gzip", 0.0}],
+        ["gzip", "identity"],
+        "identity"
+    ),
+    ["gzip", "identity"] = pick_accepted_encodings(
+        [{"gzip", 1.0}, {"deflate", 1.0}],
+        ["gzip", "identity"],
+        "identity"
+    ),
+    ["gzip", "identity"] = pick_accepted_encodings(
+        [{"gzip", 0.5}, {"deflate", 1.0}],
+        ["gzip", "identity"],
+        "identity"
+    ),
+    ["identity"] = pick_accepted_encodings(
+        [{"gzip", 0.0}, {"deflate", 0.0}],
+        ["gzip", "identity"],
+        "identity"
+    ),
+    ["gzip"] = pick_accepted_encodings(
+        [{"gzip", 1.0}, {"deflate", 1.0}, {"identity", 0.0}],
+        ["gzip", "identity"],
+        "identity"
+    ),
+    ["gzip", "deflate", "identity"] = pick_accepted_encodings(
+        [{"gzip", 1.0}, {"deflate", 1.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["gzip", "deflate"] = pick_accepted_encodings(
+        [{"gzip", 1.0}, {"deflate", 1.0}, {"identity", 0.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["deflate", "gzip", "identity"] = pick_accepted_encodings(
+        [{"gzip", 0.2}, {"deflate", 1.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["deflate", "deflate", "gzip", "identity"] = pick_accepted_encodings(
+        [{"gzip", 0.2}, {"deflate", 1.0}, {"deflate", 1.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["deflate", "gzip", "gzip", "identity"] = pick_accepted_encodings(
+        [{"gzip", 0.2}, {"deflate", 1.0}, {"gzip", 1.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["gzip", "deflate", "gzip", "identity"] = pick_accepted_encodings(
+        [{"gzip", 0.2}, {"deflate", 0.9}, {"gzip", 1.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    [] = pick_accepted_encodings(
+        [{"*", 0.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["gzip", "deflate", "identity"] = pick_accepted_encodings(
+        [{"*", 1.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["gzip", "deflate", "identity"] = pick_accepted_encodings(
+        [{"*", 0.6}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["gzip"] = pick_accepted_encodings(
+        [{"gzip", 1.0}, {"*", 0.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["gzip", "deflate"] = pick_accepted_encodings(
+        [{"gzip", 1.0}, {"deflate", 0.6}, {"*", 0.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["deflate", "gzip"] = pick_accepted_encodings(
+        [{"gzip", 0.5}, {"deflate", 1.0}, {"*", 0.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["gzip", "identity"] = pick_accepted_encodings(
+        [{"deflate", 0.0}, {"*", 1.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ["gzip", "identity"] = pick_accepted_encodings(
+        [{"*", 1.0}, {"deflate", 0.0}],
+        ["gzip", "deflate", "identity"],
+        "identity"
+    ),
+    ok.
diff --git a/test/etap/030-doc-from-json.t b/test/etap/030-doc-from-json.t
index dc3327aa..359a75f9 100755
--- a/test/etap/030-doc-from-json.t
+++ b/test/etap/030-doc-from-json.t
@@ -17,7 +17,11 @@
 %% XXX: Figure out how to -include("couch_db.hrl")
 -record(doc, {id= <<"">>, revs={0, []}, body={[]},
             atts=[], deleted=false, meta=[]}).
--record(att, {name, type, len, md5= <<>>, revpos=0, data}).
+-record(att, {name, type, att_len, disk_len, md5= <<>>, revpos=0, data,
+            comp=false}).
+
+default_config() ->
+    test_util:build_file("etc/couchdb/default_dev.ini").
 
 main(_) ->
     test_util:init_code_path(),
@@ -32,6 +36,8 @@ main(_) ->
     ok.
 
 test() ->
+    couch_config:start_link([default_config()]),
+    couch_config:set("attachments", "compression_level", "0"),
     ok = test_from_json_success(),
     ok = test_from_json_errors(),
     ok.
@@ -85,13 +91,15 @@ test_from_json_success() ->
                     name = <<"my_attachment.fu">>,
                     data = stub,
                     type = <<"application/awesome">>,
-                    len = 45
+                    att_len = 45,
+                    disk_len = 45
                 },
                 #att{
                     name = <<"noahs_private_key.gpg">>,
                     data = <<"I have a pet fish!">>,
                     type = <<"application/pgp-signature">>,
-                    len = 18
+                    att_len = 18,
+                    disk_len = 18
                 }
             ]},
             "Attachments are parsed correctly."
diff --git a/test/etap/031-doc-to-json.t b/test/etap/031-doc-to-json.t
index 4e7a175f..89cf4bc9 100755
--- a/test/etap/031-doc-to-json.t
+++ b/test/etap/031-doc-to-json.t
@@ -17,7 +17,11 @@
 %% XXX: Figure out how to -include("couch_db.hrl")
 -record(doc, {id= <<"">>, revs={0, []}, body={[]},
             atts=[], deleted=false, meta=[]}).
--record(att, {name, type, len, md5= <<>>, revpos=0, data}).
+-record(att, {name, type, att_len, disk_len, md5= <<>>, revpos=0, data,
+            comp=false}).
+
+default_config() ->
+    test_util:build_file("etc/couchdb/default_dev.ini").
 
 main(_) ->
     test_util:init_code_path(),
@@ -32,6 +36,8 @@ main(_) ->
     ok.
 
 test() ->
+    couch_config:start_link([default_config()]),
+    couch_config:set("attachments", "compression_level", "0"),
     ok = test_to_json_success(),
     ok.
 
@@ -116,14 +122,16 @@ test_to_json_success() ->
                     type = <<"xml/sucks">>, 
                     data = fun() -> ok end,
                     revpos = 1,
-                    len = 400
+                    att_len = 400,
+                    disk_len = 400
                 },
                 #att{
                     name = <<"fast.json">>, 
                     type = <<"json/ftw">>, 
                     data = <<"{\"so\": \"there!\"}">>,
                     revpos = 1,
-                    len = 16
+                    att_len = 16,
+                    disk_len = 16
                 }
             ]},
             {[
@@ -153,7 +161,8 @@ test_to_json_success() ->
                     type = <<"text/plain">>,
                     data = fun() -> <<"diet pepsi">> end,
                     revpos = 1,
-                    len = 10
+                    att_len = 10,
+                    disk_len = 10
                 },
                 #att{
                     name = <<"food.now">>,
diff --git a/test/etap/050-stream.t b/test/etap/050-stream.t
index 9324916c..545dd524 100755
--- a/test/etap/050-stream.t
+++ b/test/etap/050-stream.t
@@ -42,7 +42,7 @@ test() ->
     etap:is(ok, couch_stream:write(Stream, <<>>),
         "Writing an empty binary does nothing."),
 
-    {Ptrs, Length, _} = couch_stream:close(Stream),
+    {Ptrs, Length, _, _, _} = couch_stream:close(Stream),
     etap:is(Ptrs, [0], "Close returns the file pointers."),
     etap:is(Length, 8, "Close also returns the number of bytes written."),
     etap:is(<<"foodfoob">>, read_all(Fd, Ptrs), "Returned pointers are valid."),
@@ -58,7 +58,7 @@ test() ->
     etap:is(ok, couch_stream:write(Stream2, ZeroBits),
         "Successfully wrote 80 0 bits."),
 
-    {Ptrs2, Length2, _} = couch_stream:close(Stream2),
+    {Ptrs2, Length2, _, _, _} = couch_stream:close(Stream2),
     etap:is(Ptrs2, [ExpPtr], "Closing stream returns the file pointers."),
     etap:is(Length2, 20, "Length written is 160 bytes."),
 
@@ -73,7 +73,7 @@ test() ->
         couch_stream:write(Stream3, Data),
         [Data | Acc]
     end, [], lists:seq(1, 1024)),
-    {Ptrs3, Length3, _} = couch_stream:close(Stream3),
+    {Ptrs3, Length3, _, _, _} = couch_stream:close(Stream3),
 
     % 4095 because of 5 * 4096 rem 5 (last write before exceeding threshold)
     % + 5 puts us over the threshold
diff --git a/test/etap/140-attachment-comp.t b/test/etap/140-attachment-comp.t
new file mode 100755
index 00000000..cb3039e6
--- /dev/null
+++ b/test/etap/140-attachment-comp.t
@@ -0,0 +1,553 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+default_config() ->
+    test_util:build_file("etc/couchdb/default_dev.ini").
+
+test_db_name() ->
+    <<"couch_test_atts_compression">>.
+
+main(_) ->
+    test_util:init_code_path(),
+
+    etap:plan(57),
+    case (catch test()) of
+        ok ->
+            etap:end_tests();
+        Other ->
+            etap:diag(io_lib:format("Test died abnormally: ~p", [Other])),
+            etap:bail(Other)
+    end,
+    ok.
+
+test() ->
+    couch_server_sup:start_link([default_config()]),
+    put(addr, couch_config:get("httpd", "bind_address", "127.0.0.1")),
+    put(port, couch_config:get("httpd", "port", "5984")),
+    application:start(inets),
+    timer:sleep(1000),
+    couch_server:delete(test_db_name(), []),
+    couch_db:create(test_db_name(), []),
+
+    couch_config:set("attachments", "compression_level", "8"),
+    couch_config:set("attachments", "compressible_types", "text/*"),
+
+    create_1st_text_att(),
+    create_1st_png_att(),
+    create_2nd_text_att(),
+    create_2nd_png_att(),
+
+    tests_for_1st_text_att(),
+    tests_for_1st_png_att(),
+    tests_for_2nd_text_att(),
+    tests_for_2nd_png_att(),
+
+    timer:sleep(3000), % to avoid mochiweb socket closed exceptions
+    couch_server:delete(test_db_name(), []),
+    couch_server_sup:stop(),
+    ok.
+
+db_url() ->
+    "http://" ++ get(addr) ++ ":" ++ get(port) ++ "/" ++
+    binary_to_list(test_db_name()).
+
+create_1st_text_att() ->
+    {ok, {{_, Code, _}, _Headers, _Body}} = http:request(
+        put,
+        {db_url() ++ "/testdoc1/readme.txt", [],
+        "text/plain", test_text_data()},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 201, "Created text attachment using the standalone api"),
+    ok.
+
+create_1st_png_att() ->
+    {ok, {{_, Code, _}, _Headers, _Body}} = http:request(
+        put,
+        {db_url() ++ "/testdoc2/icon.png", [],
+        "image/png", test_png_data()},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 201, "Created png attachment using the standalone api"),
+    ok.
+
+% create a text attachment using the non-standalone attachment api
+create_2nd_text_att() ->
+    DocJson = {[
+        {<<"_attachments">>, {[
+            {<<"readme.txt">>, {[
+                {<<"content_type">>, <<"text/plain">>},
+                {<<"data">>, base64:encode(test_text_data())}
+            ]}
+        }]}}
+    ]},
+    {ok, {{_, Code, _}, _Headers, _Body}} = http:request(
+        put,
+        {db_url() ++ "/testdoc3", [],
+        "application/json", list_to_binary(couch_util:json_encode(DocJson))},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 201, "Created text attachment using the non-standalone api"),
+    ok.
+
+% create a png attachment using the non-standalone attachment api
+create_2nd_png_att() ->
+    DocJson = {[
+        {<<"_attachments">>, {[
+            {<<"icon.png">>, {[
+                {<<"content_type">>, <<"image/png">>},
+                {<<"data">>, base64:encode(test_png_data())}
+            ]}
+        }]}}
+    ]},
+    {ok, {{_, Code, _}, _Headers, _Body}} = http:request(
+        put,
+        {db_url() ++ "/testdoc4", [],
+        "application/json", list_to_binary(couch_util:json_encode(DocJson))},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 201, "Created png attachment using the non-standalone api"),
+    ok.
+
+tests_for_1st_text_att() ->
+    test_get_1st_text_att_with_accept_encoding_gzip(),
+    test_get_1st_text_att_without_accept_encoding_header(),
+    test_get_1st_text_att_with_accept_encoding_deflate(),
+    test_get_1st_text_att_with_accept_encoding_deflate_only(),
+    test_get_doc_with_1st_text_att(),
+    test_length_1st_text_att_stub().
+
+tests_for_1st_png_att() ->
+    test_get_1st_png_att_without_accept_encoding_header(),
+    test_get_1st_png_att_with_accept_encoding_gzip(),
+    test_get_1st_png_att_with_accept_encoding_deflate(),
+    test_get_doc_with_1st_png_att(),
+    test_length_1st_png_att_stub().
+
+tests_for_2nd_text_att() ->
+    test_get_2nd_text_att_with_accept_encoding_gzip(),
+    test_get_2nd_text_att_without_accept_encoding_header(),
+    test_get_doc_with_2nd_text_att(),
+    test_length_2nd_text_att_stub().
+
+tests_for_2nd_png_att() ->
+    test_get_2nd_png_att_without_accept_encoding_header(),
+    test_get_2nd_png_att_with_accept_encoding_gzip(),
+    test_get_doc_with_2nd_png_att(),
+    test_length_2nd_png_att_stub().
+
+test_get_1st_text_att_with_accept_encoding_gzip() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc1/readme.txt", [{"Accept-Encoding", "gzip"}]},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, true, "received body is gziped"),
+    Uncompressed = binary_to_list(zlib:gunzip(list_to_binary(Body))),
+    etap:is(
+        Uncompressed,
+        test_text_data(),
+        "received data for the 1st text attachment is ok"
+    ),
+    ok.
+
+test_get_1st_text_att_without_accept_encoding_header() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc1/readme.txt", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, false, "received body is not gziped"),
+    etap:is(
+        Body,
+        test_text_data(),
+        "received data for the 1st text attachment is ok"
+    ),
+    ok.
+
+test_get_1st_text_att_with_accept_encoding_deflate() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc1/readme.txt", [{"Accept-Encoding", "deflate"}]},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, false, "received body is not gziped"),
+    Deflated = lists:member({"content-encoding", "deflate"}, Headers),
+    etap:is(Deflated, false, "received body is not deflated"),
+    etap:is(
+        Body,
+        test_text_data(),
+        "received data for the 1st text attachment is ok"
+    ),
+    ok.
+
+test_get_1st_text_att_with_accept_encoding_deflate_only() ->
+    {ok, {{_, Code, _}, _Headers, _Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc1/readme.txt",
+            [{"Accept-Encoding", "deflate, *;q=0"}]},
+        [],
+        [{sync, true}]),
+    etap:is(
+        Code,
+        406,
+        "HTTP response code is 406 for an unsupported content encoding request"
+    ),
+    ok.
+
+test_get_1st_png_att_without_accept_encoding_header() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc2/icon.png", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, false, "received body is not gziped"),
+    etap:is(
+        Body,
+        test_png_data(),
+        "received data for the 1st png attachment is ok"
+    ),
+    ok.
+
+test_get_1st_png_att_with_accept_encoding_gzip() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc2/icon.png", [{"Accept-Encoding", "gzip"}]},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, false, "received body is not gziped"),
+    etap:is(
+        Body,
+        test_png_data(),
+        "received data for the 1st png attachment is ok"
+    ),
+    ok.
+
+test_get_1st_png_att_with_accept_encoding_deflate() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc2/icon.png", [{"Accept-Encoding", "deflate"}]},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Deflated = lists:member({"content-encoding", "deflate"}, Headers),
+    etap:is(Deflated, false, "received body is not deflated"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, false, "received body is not gziped"),
+    etap:is(
+        Body,
+        test_png_data(),
+        "received data for the 1st png attachment is ok"
+    ),
+    ok.
+
+test_get_doc_with_1st_text_att() ->
+    {ok, {{_, Code, _}, _Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc1?attachments=true", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Json = couch_util:json_decode(Body),
+    TextAttJson = couch_util:get_nested_json_value(
+        Json,
+        [<<"_attachments">>, <<"readme.txt">>]
+    ),
+    TextAttType = couch_util:get_nested_json_value(
+        TextAttJson,
+        [<<"content_type">>]
+    ),
+    TextAttData = couch_util:get_nested_json_value(
+        TextAttJson,
+        [<<"data">>]
+    ),
+    etap:is(
+        TextAttType,
+        <<"text/plain">>,
+        "1st text attachment has type text/plain"
+    ),
+    %% check the attachment's data is the base64 encoding of the plain text
+    %% and not the base64 encoding of the gziped plain text
+    etap:is(
+        TextAttData,
+        base64:encode(test_text_data()),
+        "1st text attachment data is properly base64 encoded"
+    ),
+    ok.
+
+test_length_1st_text_att_stub() ->
+    {ok, {{_, Code, _}, _Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc1", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Json = couch_util:json_decode(Body),
+    TextAttJson = couch_util:get_nested_json_value(
+        Json,
+        [<<"_attachments">>, <<"readme.txt">>]
+    ),
+    TextAttLength = couch_util:get_nested_json_value(
+        TextAttJson,
+        [<<"length">>]
+    ),
+    etap:is(
+        TextAttLength,
+        length(test_text_data()),
+        "1st text attachment stub length matches the uncompressed length"
+    ),
+    ok.
+
+test_get_doc_with_1st_png_att() ->
+    {ok, {{_, Code, _}, _Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc2?attachments=true", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Json = couch_util:json_decode(Body),
+    PngAttJson = couch_util:get_nested_json_value(
+        Json,
+        [<<"_attachments">>, <<"icon.png">>]
+    ),
+    PngAttType = couch_util:get_nested_json_value(
+        PngAttJson,
+        [<<"content_type">>]
+    ),
+    PngAttData = couch_util:get_nested_json_value(
+        PngAttJson,
+        [<<"data">>]
+    ),
+    etap:is(PngAttType, <<"image/png">>, "attachment has type image/png"),
+    etap:is(
+        PngAttData,
+        base64:encode(test_png_data()),
+        "1st png attachment data is properly base64 encoded"
+    ),
+    ok.
+
+test_length_1st_png_att_stub() ->
+    {ok, {{_, Code, _}, _Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc2", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Json = couch_util:json_decode(Body),
+    PngAttJson = couch_util:get_nested_json_value(
+        Json,
+        [<<"_attachments">>, <<"icon.png">>]
+    ),
+    PngAttLength = couch_util:get_nested_json_value(
+        PngAttJson,
+        [<<"length">>]
+    ),
+    etap:is(
+        PngAttLength,
+        length(test_png_data()),
+        "1st png attachment stub length matches the uncompressed length"
+    ),
+    ok.
+
+test_get_2nd_text_att_with_accept_encoding_gzip() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc3/readme.txt", [{"Accept-Encoding", "gzip"}]},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, true, "received body is gziped"),
+    Uncompressed = binary_to_list(zlib:gunzip(list_to_binary(Body))),
+    etap:is(
+        Uncompressed,
+        test_text_data(),
+        "received data for the 2nd text attachment is ok"
+    ),
+    ok.
+
+test_get_2nd_text_att_without_accept_encoding_header() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc3/readme.txt", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, false, "received body is not gziped"),
+    etap:is(
+        Body,
+        test_text_data(),
+        "received data for the 2nd text attachment is ok"
+    ),
+    ok.
+
+test_get_2nd_png_att_without_accept_encoding_header() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc4/icon.png", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, false, "received body is not gziped"),
+    etap:is(
+        Body,
+        test_png_data(),
+        "received data for the 2nd png attachment is ok"
+    ),
+    ok.
+
+test_get_2nd_png_att_with_accept_encoding_gzip() ->
+    {ok, {{_, Code, _}, Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc4/icon.png", [{"Accept-Encoding", "gzip"}]},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Gziped = lists:member({"content-encoding", "gzip"}, Headers),
+    etap:is(Gziped, false, "received body is not gziped"),
+    etap:is(
+        Body,
+        test_png_data(),
+        "received data for the 2nd png attachment is ok"
+    ),
+    ok.
+
+test_get_doc_with_2nd_text_att() ->
+    {ok, {{_, Code, _}, _Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc3?attachments=true", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Json = couch_util:json_decode(Body),
+    TextAttJson = couch_util:get_nested_json_value(
+        Json,
+        [<<"_attachments">>, <<"readme.txt">>]
+    ),
+    TextAttType = couch_util:get_nested_json_value(
+        TextAttJson,
+        [<<"content_type">>]
+    ),
+    TextAttData = couch_util:get_nested_json_value(
+        TextAttJson,
+        [<<"data">>]
+    ),
+    etap:is(TextAttType, <<"text/plain">>, "attachment has type text/plain"),
+    %% check the attachment's data is the base64 encoding of the plain text
+    %% and not the base64 encoding of the gziped plain text
+    etap:is(
+        TextAttData,
+        base64:encode(test_text_data()),
+        "2nd text attachment data is properly base64 encoded"
+    ),
+    ok.
+
+test_length_2nd_text_att_stub() ->
+    {ok, {{_, Code, _}, _Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc3", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Json = couch_util:json_decode(Body),
+    TextAttJson = couch_util:get_nested_json_value(
+        Json,
+        [<<"_attachments">>, <<"readme.txt">>]
+    ),
+    TextAttLength = couch_util:get_nested_json_value(
+        TextAttJson,
+        [<<"length">>]
+    ),
+    etap:is(
+        TextAttLength,
+        length(test_text_data()),
+        "2nd text attachment stub length matches the uncompressed length"
+    ),
+    ok.
+
+test_get_doc_with_2nd_png_att() ->
+    {ok, {{_, Code, _}, _Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc4?attachments=true", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Json = couch_util:json_decode(Body),
+    PngAttJson = couch_util:get_nested_json_value(
+        Json,
+        [<<"_attachments">>, <<"icon.png">>]
+    ),
+    PngAttType = couch_util:get_nested_json_value(
+        PngAttJson,
+        [<<"content_type">>]
+    ),
+    PngAttData = couch_util:get_nested_json_value(
+        PngAttJson,
+        [<<"data">>]
+    ),
+    etap:is(PngAttType, <<"image/png">>, "attachment has type image/png"),
+    etap:is(
+        PngAttData,
+        base64:encode(test_png_data()),
+        "2nd png attachment data is properly base64 encoded"
+    ),
+    ok.
+
+test_length_2nd_png_att_stub() ->
+    {ok, {{_, Code, _}, _Headers, Body}} = http:request(
+        get,
+        {db_url() ++ "/testdoc4", []},
+        [],
+        [{sync, true}]),
+    etap:is(Code, 200, "HTTP response code is 200"),
+    Json = couch_util:json_decode(Body),
+    PngAttJson = couch_util:get_nested_json_value(
+        Json,
+        [<<"_attachments">>, <<"icon.png">>]
+    ),
+    PngAttLength = couch_util:get_nested_json_value(
+        PngAttJson,
+        [<<"length">>]
+    ),
+    etap:is(
+        PngAttLength,
+        length(test_png_data()),
+        "2nd png attachment stub length matches the uncompressed length"
+    ),
+    ok.
+
+test_png_data() ->
+    {ok, Data} = file:read_file(
+        test_util:source_file("share/www/image/logo.png")
+    ),
+    binary_to_list(Data).
+
+test_text_data() ->
+    {ok, Data} = file:read_file(
+        test_util:source_file("README")
+    ),
+    binary_to_list(Data).