summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_rep_att.erl
diff options
context:
space:
mode:
authorFilipe David Borba Manana <fdmanana@apache.org>2010-07-16 21:35:57 +0000
committerFilipe David Borba Manana <fdmanana@apache.org>2010-07-16 21:35:57 +0000
commit0afa7e82448ed103e472cddd9c82ad7f924d1385 (patch)
tree55cdb73a54a8558fc3544e5e0e9ae9069711f6ad /src/couchdb/couch_rep_att.erl
parent5cce8596fcab48bdef8ea913d140ada2cf87e869 (diff)
Merge revision 964956 from trunk:
Fix for a pull replication, targeted to a 1.0 CouchDB server, where the source DB is in a remote CouchDB 0.11.0 server and the target DB is local (1.0 CouchDB DB). Closes ticket COUCHDB-827. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@964957 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_rep_att.erl')
-rw-r--r--src/couchdb/couch_rep_att.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/couchdb/couch_rep_att.erl b/src/couchdb/couch_rep_att.erl
index 28b8945c..367afbb5 100644
--- a/src/couchdb/couch_rep_att.erl
+++ b/src/couchdb/couch_rep_att.erl
@@ -81,8 +81,12 @@ receive_data(Ref, ReqId, ContentEncoding) ->
% ?LOG_DEBUG("got ~p bytes for ~p", [size(Data), ReqId]),
Data;
{ibrowse_async_response_end, ReqId} ->
- ?LOG_ERROR("streaming att. ended but more data requested ~p", [ReqId]),
- throw({attachment_request_failed, premature_end})
+ % This means ibrowse received all the data it was supposed to.
+ % In case of not receiving the whole data, due to a network link
+ % failure for example, we would have received an error message.
+ % In other words, this message doesn't represent an error - look into
+ % ibrowse_http_client.erl.
+ eof
after 31000 ->
throw({attachment_request_failed, timeout})
end.