aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_client/httpc_internal.hrl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2012-01-20 18:45:47 +0100
committerErlang/OTP <[email protected]>2012-01-20 18:45:47 +0100
commita8af5a6bae97ddd7bfc2bcff2e701fa37f47640c (patch)
treebe3b89e0f25d74d59134396e9043277532cf8478 /lib/inets/src/http_client/httpc_internal.hrl
parent5790c87a3c155dbe49b82a8f3b3b74f9fec9d71d (diff)
parente8d003e44171f4ed04aaa017b7010ee5746162a9 (diff)
downloadotp-a8af5a6bae97ddd7bfc2bcff2e701fa37f47640c.tar.gz
otp-a8af5a6bae97ddd7bfc2bcff2e701fa37f47640c.tar.bz2
otp-a8af5a6bae97ddd7bfc2bcff2e701fa37f47640c.zip
Merge branch 'bmk/inets/inets581_integration/r15' into maint-r15
* bmk/inets/inets581_integration/r15: [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.hrl36
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 1fbbaa8d13..8af752546c 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-2011. 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
@@ -115,17 +115,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,