diff options
author | Ingela Anderton Andin <[email protected]> | 2013-02-22 14:41:55 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-02-22 14:41:55 +0100 |
commit | 5c7fe21f434f15a1005cb0529a64ca8461c83172 (patch) | |
tree | 6e79aa7bbe1a72eff14e57ef260d371365de9191 /lib/inets/src/http_server/httpd_acceptor_sup.erl | |
parent | 5b1d51fedf10ebc6cccaa4f43396f98c644f3ba9 (diff) | |
parent | da3797589463002f28fc42ef27872650fe1de938 (diff) | |
download | otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.tar.gz otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.tar.bz2 otp-5c7fe21f434f15a1005cb0529a64ca8461c83172.zip |
Merge branch 'ia/inets/httpc-pipelin-vs-persisten-and-httpd-ssl-conf'
* ia/inets/httpc-pipelin-vs-persisten-and-httpd-ssl-conf:
inets httpd: Handle ipfamily option correctly when listning to port 0
inets: Improve ssl handling
inets httpd: The option modules now defaults to its documented default value.
inets httpc: Corrected separation of pipelining and persisten connections
Diffstat (limited to 'lib/inets/src/http_server/httpd_acceptor_sup.erl')
-rw-r--r-- | lib/inets/src/http_server/httpd_acceptor_sup.erl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/inets/src/http_server/httpd_acceptor_sup.erl b/lib/inets/src/http_server/httpd_acceptor_sup.erl index 8b1e4b6c4f..df837b5a24 100644 --- a/lib/inets/src/http_server/httpd_acceptor_sup.erl +++ b/lib/inets/src/http_server/httpd_acceptor_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. +%% Copyright Ericsson AB 2001-2013. All Rights Reserved. %% %% 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 @@ -27,7 +27,7 @@ -behaviour(supervisor). %% API --export([start_link/2, start_acceptor/5, start_acceptor/6, stop_acceptor/2]). +-export([start_link/2, start_acceptor/6, start_acceptor/7, stop_acceptor/2]). %% Supervisor callback -export([init/1]). @@ -43,11 +43,11 @@ start_link(Addr, Port) -> %% Function: [start|stop]_acceptor/5 %% Description: Starts/stops an [auth | security] worker (child) process %%---------------------------------------------------------------------- -start_acceptor(SocketType, Addr, Port, ConfigDb, AcceptTimeout) -> - start_worker(httpd_acceptor, SocketType, Addr, Port, +start_acceptor(SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout) -> + start_worker(httpd_acceptor, SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout, self(), []). -start_acceptor(SocketType, Addr, Port, ConfigDb, AcceptTimeout, ListenSocket) -> - start_worker(httpd_acceptor, SocketType, Addr, Port, +start_acceptor(SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout, ListenSocket) -> + start_worker(httpd_acceptor, SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout, ListenSocket, self(), []). @@ -69,18 +69,18 @@ init(_) -> make_name(Addr,Port) -> httpd_util:make_name("httpd_acc_sup", Addr, Port). -start_worker(M, SocketType, Addr, Port, ConfigDB, AcceptTimeout, Manager, Modules) -> +start_worker(M, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout, Manager, Modules) -> SupName = make_name(Addr, Port), - Args = [Manager, SocketType, Addr, Port, ConfigDB, AcceptTimeout], + Args = [Manager, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout], Spec = {{M, Addr, Port}, {M, start_link, Args}, permanent, timer:seconds(1), worker, [M] ++ Modules}, supervisor:start_child(SupName, Spec). -start_worker(M, SocketType, Addr, Port, ConfigDB, AcceptTimeout, ListenSocket, +start_worker(M, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout, ListenSocket, Manager, Modules) -> SupName = make_name(Addr, Port), - Args = [Manager, SocketType, ListenSocket, ConfigDB, AcceptTimeout], + Args = [Manager, SocketType, ListenSocket, IpFamily, ConfigDB, AcceptTimeout], Spec = {{M, Addr, Port}, {M, start_link, Args}, permanent, timer:seconds(1), worker, [M] ++ Modules}, |