inets: Patch 1129

    OTP-8739  [httpc] If a request times out (not connect timeout), the
              handler process exited (normal) but neglected to inform
              the manager process. For this reason, the manager did not
              clean up the request table, resulting in a memory leak.
              Also the manager did not create a monitor for the handler,
              so in an unforseen handler crash, this could also create
              a memory leak.

    OTP-8741  The service tftp was spelled wrong in documentation and
              in some parts of the code. It should be tftp.

    OTP-8742  [httpc] Replaced the old http client api module (http) with
              the new, httpc in the users guide.

3 files changed, 96 insertions, 18 deletions

diff --git a/lib/inets/test/ftp_macosx_x86_test.erl b/lib/inets/test/ftp_macosx_x86_test.erl
index c59a992421..5566d4feaa 100644
--- a/lib/inets/test/ftp_macosx_x86_test.erl
+++ b/lib/inets/test/ftp_macosx_x86_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-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
@@ -108,7 +108,7 @@ passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
 passive_cd(X) -> ?LIB_MOD:passive_cd(X).
 passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
 passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
+passive_nlist(X) -> ?LIB_MOD:passive_nlist([{wildcard_support, false} | X]).
 passive_rename(X) -> ?LIB_MOD:passive_rename(X).
 passive_delete(X) -> ?LIB_MOD:passive_delete(X).
 passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
@@ -129,7 +129,7 @@ active_pwd(X) -> ?LIB_MOD:active_pwd(X).
 active_cd(X) -> ?LIB_MOD:active_cd(X).
 active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
 active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
+active_nlist(X) -> ?LIB_MOD:active_nlist([{wildcard_support, false} | X]). 
 active_rename(X) -> ?LIB_MOD:active_rename(X). 
 active_delete(X) -> ?LIB_MOD:active_delete(X). 
 active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl
index 75e1a5a7f9..b3c4ff2657 100644
--- a/lib/inets/test/ftp_suite_lib.erl
+++ b/lib/inets/test/ftp_suite_lib.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2005-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%
 %%
 %%
@@ -497,7 +497,8 @@ passive_nlist(suite) ->
     [];
 passive_nlist(Config) when is_list(Config) ->
     Pid = ?config(ftp, Config),
-    do_nlist(Pid).
+    WildcardSupport = ?config(wildcard_support, Config),
+    do_nlist(Pid, WildcardSupport).
 
 
 %%-------------------------------------------------------------------------
@@ -757,7 +758,8 @@ active_nlist(suite) ->
     [];
 active_nlist(Config) when is_list(Config) ->
     Pid = ?config(ftp, Config),
-    do_nlist(Pid).
+    WildcardSupport = ?config(wildcard_support, Config),
+    do_nlist(Pid, WildcardSupport).
 
 
 %%-------------------------------------------------------------------------
@@ -1218,16 +1220,20 @@ do_ls(Pid) ->
     {ok, _} = ftp:ls(Pid, "incom*"),
     ok.
 
-do_nlist(Pid) ->
+do_nlist(Pid, WildcardSupport) ->
     {ok, _} = ftp:nlist(Pid),
     {ok, _} = ftp:nlist(Pid, "incoming"),
     %% neither nlist nor ls operates on a directory
     %% they operate on a pathname, which *can* be a 
     %% directory, but can also be a filename or a group 
     %% of files (including wildcards).
-    {ok, _} = ftp:nlist(Pid, "incom*"),
-%%     {error, epath} = ftp:nlist(Pid, ?BAD_DIR),
-    ok.
+    case WildcardSupport of
+	true ->
+	    {ok, _} = ftp:nlist(Pid, "incom*"),
+	    ok;
+	_ ->
+	    ok
+    end.
 
 do_rename(Pid, Config) ->
     PrivDir = ?config(priv_dir, Config),
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index aa65fb1197..f2e8bebe07 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%%
+%% 
 %% Copyright Ericsson AB 2004-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%
 %%
 %%
@@ -284,7 +284,8 @@ tickets(suite) ->
      otp_8106,
      otp_8056,
      otp_8352, 
-     otp_8371
+     otp_8371,
+     otp_8739
     ].
 
 
@@ -2440,7 +2441,78 @@ otp_8371(Config) when is_list(Config) ->
     ok.
 
 
+%%-------------------------------------------------------------------------
 
+otp_8739(doc) ->
+    ["OTP-8739"];
+otp_8739(suite) ->
+    [];
+otp_8739(Config) when is_list(Config) ->
+    {_DummyServerPid, Port} = otp_8739_dummy_server(),
+    URL = ?URL_START ++ integer_to_list(Port) ++ "/dummy.html",
+    Method      = get,
+    Request     = {URL, []}, 
+    HttpOptions = [{connect_timeout, 500}, {timeout, 1}], 
+    Options     = [{sync, true}], 
+    case http:request(Method, Request, HttpOptions, Options) of
+	{error, timeout} ->
+	    %% And now we check the size of the handler db
+	    Info = httpc:info(),
+	    tsp("Info: ~p", [Info]),
+	    {value, {handlers, Handlers}} = 
+		lists:keysearch(handlers, 1, Info),
+	    case Handlers of
+		[] ->
+		    ok;
+		_ ->
+		    tsf({unexpected_handlers, Handlers})
+	    end;
+	Unexpected ->
+	    tsf({unexpected, Unexpected})
+    end.
+
+
+otp_8739_dummy_server() ->
+    Parent = self(), 
+    Pid = spawn_link(fun() -> otp_8739_dummy_server_init(Parent) end),
+    receive
+	{port, Port} ->
+	    {Pid, Port}
+    end.
+
+otp_8739_dummy_server_init(Parent) ->
+    {ok, ListenSocket} = 
+	gen_tcp:listen(0, [binary, inet, {packet, 0},
+			   {reuseaddr,true},
+			   {active, false}]),
+    {ok, Port} = inet:port(ListenSocket),
+    Parent ! {port, Port},
+    otp_8739_dummy_server_main(Parent, ListenSocket).
+
+otp_8739_dummy_server_main(Parent, ListenSocket) ->
+    case gen_tcp:accept(ListenSocket) of
+	{ok, Sock} ->
+	    %% Ignore the request, and simply wait for the socket to close
+	    receive
+		{tcp_closed, Sock} ->
+		    (catch gen_tcp:close(ListenSocket)),
+		    exit(normal);
+		{tcp_error, Sock, Reason} ->
+		    tsp("socket error: ~p", [Reason]),
+		    (catch gen_tcp:close(ListenSocket)),
+		    exit(normal)
+	    after 10000 ->
+		    %% Just in case
+		    (catch gen_tcp:close(Sock)),
+		    (catch gen_tcp:close(ListenSocket)),
+		    exit(timeout)
+	    end;
+	Error ->
+	    exit(Error)
+    end.
+
+		       
+    
 %%--------------------------------------------------------------------
 %% Internal functions
 %%--------------------------------------------------------------------