aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app/inets.app.src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-12-17 09:14:56 +0100
committerIngela Anderton Andin <[email protected]>2014-01-10 16:01:27 +0100
commitd9674f32811cd5bb02b0d6656053b5ee226bc74c (patch)
tree32d92a3b09a8bd3f2d793cce830bd43ac4b3b421 /lib/inets/src/inets_app/inets.app.src
parentfaafa93775d3c56cb6f59b9096e959cac6a59e25 (diff)
downloadotp-d9674f32811cd5bb02b0d6656053b5ee226bc74c.tar.gz
otp-d9674f32811cd5bb02b0d6656053b5ee226bc74c.tar.bz2
otp-d9674f32811cd5bb02b0d6656053b5ee226bc74c.zip
inets: Mend broken max_clients check
Conflicts: lib/inets/src/http_server/httpd_manager.erl
Diffstat (limited to 'lib/inets/src/inets_app/inets.app.src')
-rw-r--r--lib/inets/src/inets_app/inets.app.src3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index 4aea2ef3d7..a6dd364c2d 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -1,7 +1,7 @@
%% This is an -*- erlang -*- file.
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. 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
@@ -59,6 +59,7 @@
httpd_acceptor,
httpd_acceptor_sup,
httpd_cgi,
+ httpd_connection_sup,
httpd_conf,
httpd_esi,
httpd_example,