diff options
author | Erlang/OTP <[email protected]> | 2011-06-22 14:16:22 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2011-06-22 14:16:22 +0200 |
commit | 9cb4040e4aeed40a52f174a7c4d9106e38572605 (patch) | |
tree | b0d3caca47d76422becf4c1a2a82d687191e0b9c /lib/inets/src/http_client/httpc_handler.erl | |
parent | 5eec30647ab41ad9a0c9911d2e4e300ecb501333 (diff) | |
parent | e2249b9878d396663a115628de16b1b1efde0afc (diff) | |
download | otp-9cb4040e4aeed40a52f174a7c4d9106e38572605.tar.gz otp-9cb4040e4aeed40a52f174a7c4d9106e38572605.tar.bz2 otp-9cb4040e4aeed40a52f174a7c4d9106e38572605.zip |
Merge branch 'bmk/inets/inets57_integration2' into maint-r14
* bmk/inets/inets57_integration2:
Fixed non-related test case (ticket_6035).
Corrected appup-file (missing ',').
Fixed ipv6 support detection.
(httpc) test case cleanups.
Uppdated appup-file.
Fixed IPv6 test case selection. That is if a IPv6 test case should be run or not.
Stopping httpc client...
Added test cases for httpd.
Clients started stand-alone not properly handled.
Clients started stand-alone not properly handled.
Temporary solution for profile_name stuff. What about Pids???
SSL with IPv6 now works "in principle".
[httpc] Remove unnecessary usage of iolist_to_binary when processing body (for PUT and POST). Filipe David Manana OTP-9317
Set proper version (5.7).
Set proper version (5.7).
Updated release notes.
Peer/sockname resolv doesn't work with IPv6 addrs in HTTP. OTP-9343
OTP-9342: FTP client doesn't work with IPv6 OTP-9342: IpFamily config option was not handled OTP-9342: Release notes remain... OTP-9342: <credit>attila rajmund nohl</credit>
Diffstat (limited to 'lib/inets/src/http_client/httpc_handler.erl')
-rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index 1f0e012e7e..9ac9ee6f7b 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -515,7 +515,7 @@ handle_info({Proto, _Socket, Data}, {stop, normal, NewState} end, - ?hcri("data processed", []), + ?hcri("data processed", [{final_result, FinalResult}]), FinalResult; @@ -629,8 +629,9 @@ handle_info(timeout_queue, #state{timers = Timers} = State) -> Timers#timers{queue_timer = undefined}}}; %% Setting up the connection to the server somehow failed. -handle_info({init_error, _, ClientErrMsg}, +handle_info({init_error, Tag, ClientErrMsg}, State = #state{request = Request}) -> + ?hcrv("init error", [{tag, Tag}, {client_error, ClientErrMsg}]), NewState = answer_request(Request, ClientErrMsg, State), {stop, normal, NewState}; @@ -707,9 +708,9 @@ terminate(normal, %% And, just in case, close our side (**really** overkill) http_transport:close(SocketType, Socket); -terminate(Reason, #state{session = #session{id = Id, - socket = Socket, - socket_type = SocketType}, +terminate(Reason, #state{session = #session{id = Id, + socket = Socket, + socket_type = SocketType}, request = undefined, profile_name = ProfileName, timers = Timers, @@ -1403,7 +1404,7 @@ try_to_enable_pipeline_or_keep_alive( answer_request(#request{id = RequestId, from = From} = Request, Msg, #state{timers = Timers, profile_name = ProfileName} = State) -> - ?hcrt("answer request", [{request, Request}]), + ?hcrt("answer request", [{request, Request}, {msg, Msg}]), httpc_response:send(From, Msg), RequestTimers = Timers#timers.request_timers, TimerRef = |