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 B638210B2D for ; Thu, 27 Aug 2015 13:34:43 +0000 (UTC) Received: (qmail 31276 invoked by uid 500); 27 Aug 2015 13:34:43 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 31094 invoked by uid 500); 27 Aug 2015 13:34:43 -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 30890 invoked by uid 99); 27 Aug 2015 13:34:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Aug 2015 13:34:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12B1BE7E68; Thu, 27 Aug 2015 13:34:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: robertkowalski@apache.org To: commits@couchdb.apache.org Date: Thu, 27 Aug 2015 13:34:46 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] chttpd commit: updated refs/heads/2492-compaction to 3b50727 fix intendation Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/3b507275 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/3b507275 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/3b507275 Branch: refs/heads/2492-compaction Commit: 3b507275d3d5c57359d8df186c3ae81d8510af2c Parents: 78c6f70 Author: Robert Kowalski Authored: Thu Aug 27 15:34:30 2015 +0200 Committer: Robert Kowalski Committed: Thu Aug 27 15:34:30 2015 +0200 ---------------------------------------------------------------------- src/chttpd_db.erl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/3b507275/src/chttpd_db.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl index fd02692..34b568b 100644 --- a/src/chttpd_db.erl +++ b/src/chttpd_db.erl @@ -225,15 +225,11 @@ maybe_flush_changes_feed(Acc0, Data, Len) -> }, {ok, Acc}. -handle_compact_req(#httpd{ - method='POST', path_parts=[_DbName, <<"_compact">>, _DesignName | _] - }=Req, _Db) -> +handle_compact_req(#httpd{method='POST', path_parts=[_DbName, <<"_compact">>, _DesignName | _]}=Req, _Db) -> Msg = <<"Compactions for views must be triggered on a per-shard basis in CouchDB">>, couch_httpd:send_error(Req, 403, forbidden, Msg); -handle_compact_req(#httpd{ - method='POST', path_parts=[_DbName, <<"_compact">>] - }=Req, Db) -> +handle_compact_req(#httpd{method='POST', path_parts=[_DbName, <<"_compact">>]}=Req, Db) -> couch_httpd:validate_ctype(Req, "application/json"), ok = couch_db:check_is_admin(Db), couch_httpd:body(Req),