Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E32C97FEA for ; Mon, 10 Oct 2011 21:10:53 +0000 (UTC) Received: (qmail 8057 invoked by uid 500); 10 Oct 2011 21:10:53 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 7992 invoked by uid 500); 10 Oct 2011 21:10:53 -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 7985 invoked by uid 99); 10 Oct 2011 21:10:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Oct 2011 21:10:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Oct 2011 21:10:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4D73D531AA; Mon, 10 Oct 2011 21:10:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Fix R15 warning for etap_web.erl Message-Id: <20111010211029.4D73D531AA@tyr.zones.apache.org> Date: Mon, 10 Oct 2011 21:10:29 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/1.1.x da22c19f7 -> 605f274ff Fix R15 warning for etap_web.erl Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/605f274f Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/605f274f Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/605f274f Branch: refs/heads/1.1.x Commit: 605f274ff8fa5d421d7397eef3e719950b853838 Parents: 1a11127 Author: Robert Newson Authored: Mon Oct 10 22:06:37 2011 +0100 Committer: Robert Newson Committed: Mon Oct 10 22:06:48 2011 +0100 ---------------------------------------------------------------------- src/etap/etap_web.erl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/605f274f/src/etap/etap_web.erl ---------------------------------------------------------------------- diff --git a/src/etap/etap_web.erl b/src/etap/etap_web.erl index fb7aee1..f97edfd 100644 --- a/src/etap/etap_web.erl +++ b/src/etap/etap_web.erl @@ -42,7 +42,7 @@ simple_404(Url, Desc) -> %% @doc Create and return a request structure. build_request(Method, Url, Headers, Body) when Method==options;Method==get;Method==head;Method==delete;Method==trace -> - try http:request(Method, {Url, Headers}, [{autoredirect, false}], []) of + try httpc:request(Method, {Url, Headers}, [{autoredirect, false}], []) of {ok, {OutStatus, OutHeaders, OutBody}} -> etap_request:new(Method, Url, Headers, Body, OutStatus, OutHeaders, OutBody); _ -> error @@ -56,7 +56,7 @@ build_request(Method, Url, Headers, Body) when Method == post; Method == put -> {value, {"Content-Type", X}} -> X; _ -> [] end, - try http:request(Method, {Url, Headers, ContentType, Body}, [{autoredirect, false}], []) of + try httpc:request(Method, {Url, Headers, ContentType, Body}, [{autoredirect, false}], []) of {ok, {OutStatus, OutHeaders, OutBody}} -> etap_request:new(Method, Url, Headers, Body, OutStatus, OutHeaders, OutBody); _ -> error