couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [40/50] [abbrv] git commit: fix COUCHDB-1369.
Date Wed, 14 Mar 2012 22:28:02 GMT
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 <benoitc@apache.org>
Authored: Mon Jan 23 15:19:50 2012 -0800
Committer: benoitc <benoitc@apache.org>
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();


Mime
View raw message