aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-12-19 09:43:25 +0100
committerIngela Anderton Andin <[email protected]>2017-12-19 09:43:25 +0100
commit21e63eacd7af3cf7857d4673a2bf0f20cdb1f8b9 (patch)
tree4deeaefd220b8b565c07633e628843885464f082
parent952c707e9803283b1dd6f940a10a585c10f78b75 (diff)
parent9cbab81f1a38f568fd0bf9738230ce2ebeab0191 (diff)
downloadotp-21e63eacd7af3cf7857d4673a2bf0f20cdb1f8b9.tar.gz
otp-21e63eacd7af3cf7857d4673a2bf0f20cdb1f8b9.tar.bz2
otp-21e63eacd7af3cf7857d4673a2bf0f20cdb1f8b9.zip
Merge branch 'maint'
-rw-r--r--lib/inets/test/httpc_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 9b5317c6bb..0533b9ab70 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -1597,7 +1597,7 @@ dummy_request_handler_loop({Module, Function, Args}, SockType, Socket) ->
handle_request(Module, Function, Args, Socket) ->
case Module:Function(Args) of
{ok, Result} ->
- case handle_http_msg(Result, Socket) of
+ case handle_http_msg(Result, Socket, []) of
stop ->
stop;
<<>> ->
@@ -1622,7 +1622,7 @@ handle_request(Module, Function, Args, Socket) ->
NewMFA
end.
-handle_http_msg({Method, RelUri, _, {_, Headers}, Body}, Socket) ->
+handle_http_msg({Method, RelUri, _, {_, Headers}, Body}, Socket, _) ->
ct:print("Request: ~p ~p", [Method, RelUri]),
NextRequest =