You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by fd...@apache.org on 2010/08/23 19:56:44 UTC
svn commit: r988234 - in /couchdb/branches/1.0.x/src/couchdb:
couch_rep_att.erl couch_rep_httpc.erl
Author: fdmanana
Date: Mon Aug 23 17:56:44 2010
New Revision: 988234
URL: http://svn.apache.org/viewvc?rev=988234&view=rev
Log:
Merged revision 988233 from trunk:
Replicator: fix authentication failure when replicating design documents that have attachments.
Closes COUCHDB-868.
Patch by Jason Smith, thanks.
Modified:
couchdb/branches/1.0.x/src/couchdb/couch_rep_att.erl
couchdb/branches/1.0.x/src/couchdb/couch_rep_httpc.erl
Modified: couchdb/branches/1.0.x/src/couchdb/couch_rep_att.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/couch_rep_att.erl?rev=988234&r1=988233&r2=988234&view=diff
==============================================================================
--- couchdb/branches/1.0.x/src/couchdb/couch_rep_att.erl (original)
+++ couchdb/branches/1.0.x/src/couchdb/couch_rep_att.erl Mon Aug 23 17:56:44 2010
@@ -106,7 +106,7 @@ validate_headers(_Req, 200, Headers) ->
MochiHeaders = mochiweb_headers:make(Headers),
{ok, mochiweb_headers:get_value("Content-Encoding", MochiHeaders)};
validate_headers(Req, Code, Headers) when Code > 299, Code < 400 ->
- Url = mochiweb_headers:get_value("Location",mochiweb_headers:make(Headers)),
+ Url = couch_rep_httpc:redirect_url(Headers, Req#http_db.url),
NewReq = couch_rep_httpc:redirected_request(Req, Url),
{ibrowse_req_id, ReqId} = couch_rep_httpc:request(NewReq),
receive {ibrowse_async_headers, ReqId, NewCode, NewHeaders} ->
Modified: couchdb/branches/1.0.x/src/couchdb/couch_rep_httpc.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/couch_rep_httpc.erl?rev=988234&r1=988233&r2=988234&view=diff
==============================================================================
--- couchdb/branches/1.0.x/src/couchdb/couch_rep_httpc.erl (original)
+++ couchdb/branches/1.0.x/src/couchdb/couch_rep_httpc.erl Mon Aug 23 17:56:44 2010
@@ -15,7 +15,7 @@
-include("../ibrowse/ibrowse.hrl").
-export([db_exists/1, db_exists/2, full_url/1, request/1, redirected_request/2,
- spawn_worker_process/1, spawn_link_worker_process/1]).
+ redirect_url/2, spawn_worker_process/1, spawn_link_worker_process/1]).
request(#http_db{} = Req) ->
do_request(Req).