diff options
| author | Micael Karlberg <[email protected]> | 2011-06-15 18:30:40 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-06-15 18:30:40 +0200 |
| commit | 90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3 (patch) | |
| tree | 3be88bfc46afbc7e7bc0ac75b6b7403fd61f1b10 /lib/inets/src/http_client/httpc_manager.erl | |
| parent | 7c27ae290554d9577ac7c93c5d0c6106b647dc52 (diff) | |
| parent | a6e707004f9fcb370f05bb897a6ec975f1128572 (diff) | |
| download | otp-90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3.tar.gz otp-90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3.tar.bz2 otp-90a1be0b3540af99c7bc6af6ad7bb3ebb03760d3.zip | |
[httpc|httpd] Added support for IPv6 with ssl.
OTP-5566
Merge branch 'bmk/inets/handle_ipv6_with_ssl2/OTP-5566' into bmk/inets/inets57_integration2
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/test/inets_test_lib.erl
Diffstat (limited to 'lib/inets/src/http_client/httpc_manager.erl')
| -rw-r--r-- | lib/inets/src/http_client/httpc_manager.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl index 7f66b477eb..9015bf1ce2 100644 --- a/lib/inets/src/http_client/httpc_manager.erl +++ b/lib/inets/src/http_client/httpc_manager.erl @@ -52,7 +52,7 @@ cancel = [], % [{RequestId, HandlerPid, ClientPid}] handler_db, % ets() - Entry: #handler_info{} cookie_db, % cookie_db() - session_db, % ets() - Entry: #tcp_session{} + session_db, % ets() - Entry: #session{} profile_name, % atom() options = #options{} }). @@ -178,7 +178,7 @@ request_done(RequestId, ProfileName) -> %%-------------------------------------------------------------------- %% Function: insert_session(Session, ProfileName) -> _ -%% Session - #tcp_session{} +%% Session - #session{} %% ProfileName - atom() %% %% Description: Inserts session information into the httpc manager @@ -669,7 +669,7 @@ select_session(Method, HostPort, Scheme, SessionType, (SessionType =:= keep_alive) of true -> %% Look for handlers connecting to this host (HostPort) - %% tcp_session with record name field (tcp_session) and + %% session with record name field (session) and %% socket fields ignored. The fields id (part of: HostPort), %% client_close, scheme and type specified. %% The fields id (part of: HandlerPid) and queue_length |