diff options
author | Erlang/OTP <[email protected]> | 2012-01-17 15:52:46 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2012-01-17 15:52:46 +0100 |
commit | 7619b94a2c1098cbd176507b34d291806833a4b7 (patch) | |
tree | 1d41ecb5d95517ba6e64b410da18db3b2d16801e /lib/inets/src/http_client/httpc_internal.hrl | |
parent | ffd9f3c009ff53fc4d1c1f59b04d72702524413c (diff) | |
parent | 4f9b2b2b2917ffca17be3a897674ffe76011237f (diff) | |
download | otp-7619b94a2c1098cbd176507b34d291806833a4b7.tar.gz otp-7619b94a2c1098cbd176507b34d291806833a4b7.tar.bz2 otp-7619b94a2c1098cbd176507b34d291806833a4b7.zip |
Merge branch 'bmk/inets/inets573_integration' into maint-r14
* bmk/inets/inets573_integration:
[inets/httpc] The client incorrectly streams 404 responses
[inets/httpc] Add proper code change code
[inets/httpc] Add test case
[inets] Add proper release notes for OTP-9847
[inets/httpc] Fix the selection of session for keep-alive mode When selecting a session, the "state" of the session (specifically if the server has responded) was not taken into account. Attempting to fix this, a "state" field (actually available) has been added to the session record.
[ftp] Fails to open IPv6 connection
Diffstat (limited to 'lib/inets/src/http_client/httpc_internal.hrl')
-rw-r--r-- | lib/inets/src/http_client/httpc_internal.hrl | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/lib/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl index 1d8a5b6a92..3261061d61 100644 --- a/lib/inets/src/http_client/httpc_internal.hrl +++ b/lib/inets/src/http_client/httpc_internal.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2010. All Rights Reserved. +%% Copyright Ericsson AB 2005-2012. 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 @@ -112,17 +112,37 @@ } ). + -record(session, { - id, % {{Host, Port}, HandlerPid} - client_close, % true | false - scheme, % http (HTTP/TCP) | https (HTTP/SSL/TCP) - socket, % Open socket, used by connection - socket_type, % socket-type, used by connection - queue_length = 1, % Current length of pipeline or keep-alive queue - type % pipeline | keep_alive (wait for response before sending new request) + %% {{Host, Port}, HandlerPid} + id, + + %% true | false + client_close, + + %% http (HTTP/TCP) | https (HTTP/SSL/TCP) + scheme, + + %% Open socket, used by connection + socket, + + %% socket-type, used by connection + socket_type, + + %% Current length of pipeline or keep-alive queue + queue_length = 1, + + %% pipeline | keep_alive (wait for response before sending new request) + type, + + %% true | false + %% This will be true, when a response has been received for + %% the first request. See type above. + available = false }). + -record(http_cookie, { domain, |