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 9CFEF1061F for ; Wed, 9 Sep 2015 08:42:45 +0000 (UTC) Received: (qmail 67048 invoked by uid 500); 9 Sep 2015 08:42:45 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 66928 invoked by uid 500); 9 Sep 2015 08:42:45 -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 66383 invoked by uid 99); 9 Sep 2015 08:42:44 -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; Wed, 09 Sep 2015 08:42:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BC26AE051B; Wed, 9 Sep 2015 08:42:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Wed, 09 Sep 2015 08:42:52 -0000 Message-Id: <78ae2c3051f847b7a78f0066573e52c3@git.apache.org> In-Reply-To: <43ff7653837149dd96b2d961d0523760@git.apache.org> References: <43ff7653837149dd96b2d961d0523760@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/19] mochiweb commit: updated refs/heads/upstream to bd6ae7c do not stop clock on http stop Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/4daa6f3d Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/4daa6f3d Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/4daa6f3d Branch: refs/heads/upstream Commit: 4daa6f3dda213b794a860bfe9640716221d909f2 Parents: 19ba7a3 Author: Robert Kowalski Authored: Tue Aug 4 22:01:43 2015 +0200 Committer: Robert Kowalski Committed: Tue Aug 4 22:01:47 2015 +0200 ---------------------------------------------------------------------- src/mochiweb_http.erl | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/4daa6f3d/src/mochiweb_http.erl ---------------------------------------------------------------------- diff --git a/src/mochiweb_http.erl b/src/mochiweb_http.erl index a10c117..450085f 100644 --- a/src/mochiweb_http.erl +++ b/src/mochiweb_http.erl @@ -48,11 +48,9 @@ parse_options(Options) -> mochilists:set_defaults(?DEFAULTS, Options1). stop() -> - mochiweb_clock:stop(), mochiweb_socket_server:stop(?MODULE). stop(Name) -> - mochiweb_clock:stop(), mochiweb_socket_server:stop(Name). %% @spec start(Options) -> ServerRet