Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 53870 invoked from network); 13 Sep 2009 11:16:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Sep 2009 11:16:27 -0000 Received: (qmail 80509 invoked by uid 500); 13 Sep 2009 11:16:27 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 80416 invoked by uid 500); 13 Sep 2009 11:16:27 -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 80407 invoked by uid 99); 13 Sep 2009 11:16:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Sep 2009 11:16:27 +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, 13 Sep 2009 11:16:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 547D723888E4; Sun, 13 Sep 2009 11:16:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r814301 - /couchdb/branches/0.10.x/src/couchdb/couch_httpd_misc_handlers.erl Date: Sun, 13 Sep 2009 11:16:05 -0000 To: commits@couchdb.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090913111605.547D723888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jan Date: Sun Sep 13 11:16:04 2009 New Revision: 814301 URL: http://svn.apache.org/viewvc?rev=814301&view=rev Log: adhere X-Couch-Persist for DELETEs Modified: couchdb/branches/0.10.x/src/couchdb/couch_httpd_misc_handlers.erl Modified: couchdb/branches/0.10.x/src/couchdb/couch_httpd_misc_handlers.erl URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/couchdb/couch_httpd_misc_handlers.erl?rev=814301&r1=814300&r2=814301&view=diff ============================================================================== --- couchdb/branches/0.10.x/src/couchdb/couch_httpd_misc_handlers.erl (original) +++ couchdb/branches/0.10.x/src/couchdb/couch_httpd_misc_handlers.erl Sun Sep 13 11:16:04 2009 @@ -164,11 +164,12 @@ % DELETE /_config/Section/Key handle_config_req(#httpd{method='DELETE',path_parts=[_,Section,Key]}=Req) -> ok = couch_httpd:verify_is_server_admin(Req), + Persist = couch_httpd:header_value(Req, "X-Couch-Persist") /= "false", case couch_config:get(Section, Key, null) of null -> throw({not_found, unknown_config_value}); OldValue -> - couch_config:delete(Section, Key), + couch_config:delete(Section, Key, Persist), send_json(Req, 200, list_to_binary(OldValue)) end; handle_config_req(Req) ->