Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 36701 invoked from network); 30 Sep 2009 17:03:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Sep 2009 17:03:04 -0000 Received: (qmail 56176 invoked by uid 500); 30 Sep 2009 17:03:03 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 56123 invoked by uid 500); 30 Sep 2009 17:03:03 -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 56114 invoked by uid 99); 30 Sep 2009 17:03:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Sep 2009 17:03:03 +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; Wed, 30 Sep 2009 17:03:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 020BD2388908; Wed, 30 Sep 2009 17:02:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r820344 - /couchdb/trunk/src/couchdb/couch_rep_httpc.erl Date: Wed, 30 Sep 2009 17:02:41 -0000 To: commits@couchdb.apache.org From: kocolosk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090930170242.020BD2388908@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kocolosk Date: Wed Sep 30 17:02:41 2009 New Revision: 820344 URL: http://svn.apache.org/viewvc?rev=820344&view=rev Log: fix replication from DB protected by OAuth and require_valid_user=true Modified: couchdb/trunk/src/couchdb/couch_rep_httpc.erl Modified: couchdb/trunk/src/couchdb/couch_rep_httpc.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep_httpc.erl?rev=820344&r1=820343&r2=820344&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/couch_rep_httpc.erl (original) +++ couchdb/trunk/src/couchdb/couch_rep_httpc.erl Wed Sep 30 17:02:41 2009 @@ -60,9 +60,16 @@ db_exists(Req, CanonicalUrl) -> #http_db{ - url = Url, - headers = Headers + auth = Auth, + headers = Headers0, + url = Url } = Req, + Headers = case proplists:get_value(<<"oauth">>, Auth) of + undefined -> + Headers0; + {OAuthProps} -> + [oauth_header(Url, get, OAuthProps) | Headers0] + end, case catch ibrowse:send_req(Url, Headers, head) of {ok, "200", _, _} -> Req#http_db{url = CanonicalUrl};