Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 65293 invoked from network); 12 Sep 2010 11:35:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Sep 2010 11:35:50 -0000 Received: (qmail 72481 invoked by uid 500); 12 Sep 2010 11:35:49 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 72402 invoked by uid 500); 12 Sep 2010 11:35:47 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 72395 invoked by uid 99); 12 Sep 2010 11:35:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Sep 2010 11:35:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Sep 2010 11:35:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 97C4623889E7; Sun, 12 Sep 2010 11:35:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r996294 - /couchdb/branches/0.11.x/src/couchdb/couch_rep_changes_feed.erl Date: Sun, 12 Sep 2010 11:35:26 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100912113526.97C4623889E7@eris.apache.org> Author: fdmanana Date: Sun Sep 12 11:35:26 2010 New Revision: 996294 URL: http://svn.apache.org/viewvc?rev=996294&view=rev Log: Replicator bug fix: redirect from remote /db/_changes not properly handled (discarded user supplied HTTP Basic auth credentials) Modified: couchdb/branches/0.11.x/src/couchdb/couch_rep_changes_feed.erl Modified: couchdb/branches/0.11.x/src/couchdb/couch_rep_changes_feed.erl URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_rep_changes_feed.erl?rev=996294&r1=996293&r2=996294&view=diff ============================================================================== --- couchdb/branches/0.11.x/src/couchdb/couch_rep_changes_feed.erl (original) +++ couchdb/branches/0.11.x/src/couchdb/couch_rep_changes_feed.erl Sun Sep 12 11:35:26 2010 @@ -94,7 +94,7 @@ init([_Parent, #http_db{}=Source, Since, {ok, #state{conn=Pid, last_seq=Since, reqid=ReqId, init_args=Args}}; {ibrowse_async_headers, ReqId, Code, Hdrs} when Code=="301"; Code=="302" -> catch ibrowse:stop_worker_process(Pid), - Url2 = mochiweb_headers:get_value("Location", mochiweb_headers:make(Hdrs)), + Url2 = couch_rep_httpc:redirect_url(Hdrs, Req#http_db.url), %% TODO use couch_httpc:request instead of start_http_request {Pid2, ReqId2} = start_http_request(Url2), receive {ibrowse_async_headers, ReqId2, "200", _} ->