summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Kocoloski <kocolosk@apache.org>2009-07-03 01:08:43 +0000
committerAdam Kocoloski <kocolosk@apache.org>2009-07-03 01:08:43 +0000
commit2de233d67c05b32b1de6f2af18fefc56d8aad704 (patch)
treef54188e7d5ceb410829ba506953d5a64337bbb76
parent963dd5ee2c59341e1506908e164100d5fa79e10b (diff)
update check_bin_length since chunked response bug is fixed
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@790773 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/couchdb/couch_db.erl11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl
index d6105dd0..979bd39d 100644
--- a/src/couchdb/couch_db.erl
+++ b/src/couchdb/couch_db.erl
@@ -617,14 +617,15 @@ write_streamed_attachment(Stream, F, LenLeft) ->
ok = couch_stream:write(Stream, TruncatedBin),
write_streamed_attachment(Stream, F, LenLeft - size(TruncatedBin)).
-%% on rare occasions ibrowse seems to process a chunked response incorrectly
-%% and include an extra "\r" in the last chunk. This code ensures that we
-%% truncate the downloaed attachment at the length specified in the metadata.
+%% There was a bug in ibrowse 1.4.1 that would cause it to append a CR to a
+%% chunked response when the CR and LF terminating the last data chunk were
+%% split across packets. The bug was fixed in version 1.5.0, but we still
+%% check for it just in case.
check_bin_length(LenLeft, Bin) when size(Bin) > LenLeft ->
- <<ValidData:LenLeft/binary, Crap/binary>> = Bin,
+ <<_ValidData:LenLeft/binary, Crap/binary>> = Bin,
?LOG_ERROR("write_streamed_attachment has written too much expected: ~p" ++
" got: ~p tail: ~p", [LenLeft, size(Bin), Crap]),
- ValidData;
+ exit(replicated_attachment_too_large);
check_bin_length(_, Bin) -> Bin.
enum_docs_since_reduce_to_count(Reds) ->