From commits-return-8184-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Wed Mar 14 22:28:11 2012 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 9FBE497A1 for ; Wed, 14 Mar 2012 22:28:11 +0000 (UTC) Received: (qmail 17655 invoked by uid 500); 14 Mar 2012 22:28:04 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 16892 invoked by uid 500); 14 Mar 2012 22:28: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 15877 invoked by uid 99); 14 Mar 2012 22:28:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Mar 2012 22:28:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 55B1C7118; Wed, 14 Mar 2012 22:28:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [40/50] [abbrv] git commit: fix COUCHDB-1369. Message-Id: <20120314222802.55B1C7118@tyr.zones.apache.org> Date: Wed, 14 Mar 2012 22:28:02 +0000 (UTC) fix COUCHDB-1369. Don't restart https if we start httpd and vice-versa. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/851e0416 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/851e0416 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/851e0416 Branch: refs/heads/COUCHDB-1426 Commit: 851e041670b7881e7fa4556e6c36f15f49f269b1 Parents: b1d8738 Author: benoitc Authored: Mon Jan 23 15:19:50 2012 -0800 Committer: benoitc Committed: Mon Jan 23 16:23:31 2012 -0800 ---------------------------------------------------------------------- src/couchdb/couch_httpd.erl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/851e0416/src/couchdb/couch_httpd.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl index ea27bdf..b7d0c4a 100644 --- a/src/couchdb/couch_httpd.erl +++ b/src/couchdb/couch_httpd.erl @@ -158,7 +158,8 @@ start_link(Name, Options) -> stop() -> - mochiweb_http:stop(?MODULE). + mochiweb_http:stop(couch_httpd), + mochiweb_http:stop(https). config_change("httpd", "bind_address") -> ?MODULE:stop();