From 6153ba7599f2ce1ab22959a40b6ca33b4238f0d0 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 13 Jan 2010 16:18:24 +0000
Subject: OTP-8016, OTP-8056, OTP-8103, OTP-8106, OTP-8312, OTP-8315, OTP-8327,
 OTP-8349, OTP-8351, OTP-8359 & OTP-8371.

---
 lib/inets/src/http_client/httpc_handler_sup.erl | 31 ++++++++++++++-----------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'lib/inets/src/http_client/httpc_handler_sup.erl')

diff --git a/lib/inets/src/http_client/httpc_handler_sup.erl b/lib/inets/src/http_client/httpc_handler_sup.erl
index d9edaa0599..2a69fd15d0 100644
--- a/lib/inets/src/http_client/httpc_handler_sup.erl
+++ b/lib/inets/src/http_client/httpc_handler_sup.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2007-2010. 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
 %% 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 online 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.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %%
@@ -23,7 +23,7 @@
 
 %% API
 -export([start_link/0]).
--export([start_child/1]).
+-export([start_child/2]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -34,25 +34,28 @@
 start_link() ->
     supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
-start_child(Args) ->
+start_child(Options, Profile) ->
+    Args = [Options, Profile], 
     supervisor:start_child(?MODULE, Args).
-    
+
+
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
 init(Args) ->
+
     RestartStrategy = simple_one_for_one,
     MaxR = 0,
     MaxT = 3600,
    
-    Name = undefined, % As simple_one_for_one is used.
+    Name      = undefined, % As simple_one_for_one is used.
     StartFunc = {httpc_handler, start_link, Args},
-    Restart = temporary, % E.g. should not be restarted
-    Shutdown = 4000,
-    Modules = [httpc_handler],
-    Type = worker,
-    
+    Restart   = temporary, % E.g. should not be restarted
+    Shutdown  = 4000,
+    Modules   = [httpc_handler],
+    Type      = worker,
     ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules},
+
     {ok, {{RestartStrategy, MaxR, MaxT}, [ChildSpec]}}.
 
 
-- 
cgit v1.2.3