← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/ssl/src/ssl_connection_sup.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ssl/src/ssl_connection_sup.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
5
5
%% 
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
26
26
-behaviour(supervisor).
27
27
 
28
28
%% API
29
 
-export([start_link/0]).
30
 
-export([start_child/1]).
 
29
-export([start_link/0, start_link_dist/0]).
 
30
-export([start_child/1, start_child_dist/1]).
31
31
 
32
32
%% Supervisor callback
33
33
-export([init/1]).
38
38
start_link() ->
39
39
    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
40
40
 
 
41
start_link_dist() ->
 
42
    supervisor:start_link({local, ssl_connection_sup_dist}, ?MODULE, []).
 
43
 
41
44
start_child(Args) ->
42
45
    supervisor:start_child(?MODULE, Args).
43
46
    
 
47
start_child_dist(Args) ->
 
48
    supervisor:start_child(ssl_connection_sup_dist, Args).
 
49
    
44
50
%%%=========================================================================
45
51
%%%  Supervisor callback
46
52
%%%=========================================================================