diff options
author | Ingela Anderton Andin <[email protected]> | 2013-12-17 09:14:56 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-02-05 10:32:28 +0100 |
commit | e848019d1308e4dc20249ef7368ba1bdc01a0d9b (patch) | |
tree | f06e21fa5ed0a5767904b0e8cb6227ec77bec74f /lib/inets/src/inets_app | |
parent | 5b40274acb3355d23e65ef59def92e92f89c72e2 (diff) | |
download | otp-e848019d1308e4dc20249ef7368ba1bdc01a0d9b.tar.gz otp-e848019d1308e4dc20249ef7368ba1bdc01a0d9b.tar.bz2 otp-e848019d1308e4dc20249ef7368ba1bdc01a0d9b.zip |
inets: Mend broken max_clients check
Conflicts:
lib/inets/src/http_server/httpd_manager.erl
Conflicts:
lib/inets/test/inets_sup_SUITE.erl
Diffstat (limited to 'lib/inets/src/inets_app')
-rw-r--r-- | lib/inets/src/inets_app/inets.app.src | 3 |
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, |