File 0126-inets-fix-sslsocket-record-redefinition-in-httpc_SUI.patch of Package erlang
From faf71ad75fd1491e7c78d8d9420cea5dbb5469ff Mon Sep 17 00:00:00 2001
From: Konrad Pietrzak <konrad@erlang.org>
Date: Mon, 30 Sep 2024 11:51:57 +0200
Subject: [PATCH] inets: fix sslsocket record redefinition in httpc_SUITE
---
lib/inets/test/httpc_SUITE.erl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 7108e9ca49..d34fe1f9b3 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -31,6 +31,7 @@
-include("inets_test_lib.hrl").
-include("http_internal.hrl").
-include("httpc_internal.hrl").
+% -include("../../ssl/src/ssl_api.hrl").
%% Note: This directive should only be used in test suites.
-compile([export_all, nowarn_export_all]).
@@ -45,7 +46,6 @@
%% (maximum length supported by erlang)
-define(UNIX_SOCKET, "/tmp/inets_httpc_SUITE.sock").
--record(sslsocket, {fd = nil, pid = nil}).
%%--------------------------------------------------------------------
%% Common Test interface functions -----------------------------------
%%--------------------------------------------------------------------
@@ -3020,29 +3020,29 @@ get_stat(S, Opt) ->
E
end.
-getstat(#sslsocket{} = S, Opts) ->
+getstat(S, Opts) when element(1, S) =:= sslsocket ->
ssl:getstat(S, Opts);
getstat(S, Opts) ->
inet:getstat(S, Opts).
-url_start(#sslsocket{}) ->
+url_start(S) when element(1, S) =:= sslsocket ->
{ok,Host} = inet:gethostname(),
?TLS_URL_START ++ Host ++ ":";
url_start(_) ->
{ok,Host} = inet:gethostname(),
?URL_START ++ Host ++ ":".
-send(#sslsocket{} = S, Msg) ->
+send(S, Msg) when element(1, S) =:= sslsocket ->
ssl:send(S, Msg);
send(S, Msg) ->
gen_tcp:send(S, Msg).
-close(#sslsocket{} = S) ->
+close(S) when element(1, S) =:= sslsocket ->
ssl:close(S);
close(S) ->
gen_tcp:close(S).
-sockname(#sslsocket{}= S) ->
+sockname(S) when element(1, S) == sslsocket ->
ssl:sockname(S);
sockname(S) ->
inet:sockname(S).
--
2.43.0