From 39de3072bcf9fdeec6d3faeb125924c401242205 Mon Sep 17 00:00:00 2001
From: Christopher Lenz <cmlenz@apache.org>
Date: Tue, 15 Apr 2008 12:21:00 +0000
Subject: Merged mochiweb branch back into trunk.

git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@648222 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couch_inets/httpd_acceptor_sup.erl | 84 ----------------------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 src/couch_inets/httpd_acceptor_sup.erl

(limited to 'src/couch_inets/httpd_acceptor_sup.erl')

diff --git a/src/couch_inets/httpd_acceptor_sup.erl b/src/couch_inets/httpd_acceptor_sup.erl
deleted file mode 100644
index a0656e0a..00000000
--- a/src/couch_inets/httpd_acceptor_sup.erl
+++ /dev/null
@@ -1,84 +0,0 @@
-%% ``The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%% 
-%%     $Id$
-%%
-%%----------------------------------------------------------------------
-%% Purpose: The supervisor for acceptor processes in the http server, 
-%%          hangs under the httpd_instance_sup_<Addr>_<Port> supervisor.
-%%----------------------------------------------------------------------
-
--module(httpd_acceptor_sup).
-
--behaviour(supervisor).
-
-%% API
--export([start_link/2, start_acceptor/4, start_acceptor/5, stop_acceptor/2]).
-
-%% Supervisor callback
--export([init/1]).
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-start_link(Addr, Port) ->
-    SupName = make_name(Addr, Port),
-    supervisor:start_link({local, SupName}, ?MODULE, []).
-
-%%----------------------------------------------------------------------
-%% Function: [start|stop]_acceptor/5
-%% Description: Starts/stops an [auth | security] worker (child) process
-%%----------------------------------------------------------------------
-start_acceptor(SocketType, Addr, Port, ConfigDb) ->
-    start_acceptor(SocketType, Addr, Port, ConfigDb,15000).
-start_acceptor(SocketType, Addr, Port, ConfigDb, AcceptTimeout) ->
-    start_worker(httpd_acceptor, SocketType, Addr, Port,
-		 ConfigDb, AcceptTimeout, self(), []).
-
-stop_acceptor(Addr, Port) ->
-    stop_worker(httpd_acceptor, Addr, Port).
-
-%%%=========================================================================
-%%%  Supervisor callback
-%%%=========================================================================
-init(_) ->    
-    Flags     = {one_for_one, 500, 100},
-    Workers   = [],
-    {ok, {Flags, Workers}}.
-
-%%%=========================================================================
-%%%  Internal functions
-%%%=========================================================================  
-
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_acc_sup", Addr, Port).
-
-start_worker(M, SocketType, Addr, Port, ConfigDB, AcceptTimeout, Manager, Modules) ->
-    SupName = make_name(Addr, Port),
-    Args    = [Manager, SocketType, Addr, Port, ConfigDB, AcceptTimeout],
-    Spec    = {{M, Addr, Port},
-	       {M, start_link, Args}, 
-	       permanent, timer:seconds(1), worker, [M] ++ Modules},
-    supervisor:start_child(SupName, Spec).
-
-stop_worker(M, Addr, Port) ->
-    SupName = make_name(Addr, Port),
-    Name    = {M, Addr, Port},
-    case supervisor:terminate_child(SupName, Name) of
-	ok ->
-	    supervisor:delete_child(SupName, Name);
-	Error ->
-	    Error
-    end.
-- 
cgit v1.2.3