couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From beno...@apache.org
Subject git commit: fix COUCHDB-1369.
Date Tue, 24 Jan 2012 00:22:39 GMT
Updated Branches:
  refs/heads/master 84366a5aa -> 5cece68ec


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/5cece68e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5cece68e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5cece68e

Branch: refs/heads/master
Commit: 5cece68ec4e18d6be8e37dfc0e7b786b0e2140c1
Parents: 84366a5
Author: benoitc <benoitc@apache.org>
Authored: Mon Jan 23 15:19:50 2012 -0800
Committer: benoitc <benoitc@apache.org>
Committed: Mon Jan 23 16:19:41 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/5cece68e/src/couchdb/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 11dc45a..f838b64 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -159,7 +159,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();


Mime
View raw message