diff options
| author | Péter Dimitrov <[email protected]> | 2018-03-06 10:47:09 +0100 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-03-06 10:47:09 +0100 |
| commit | b8b3abfacb40d147ec834cc18742b356d6b03236 (patch) | |
| tree | 446a418d65b26f0b28ef0bab772b392493a7f57f /lib/inets/test/http_test_lib.erl | |
| parent | 84a2ed39f035dd1a569dca370dc11876993c6ecf (diff) | |
| parent | a9c87dbf7e5cb0ac50424bde9cd53772e7b77292 (diff) | |
| download | otp-b8b3abfacb40d147ec834cc18742b356d6b03236.tar.gz otp-b8b3abfacb40d147ec834cc18742b356d6b03236.tar.bz2 otp-b8b3abfacb40d147ec834cc18742b356d6b03236.zip | |
Merge branch 'peterdmv/inets/unix_domain_socket/OTP-14854' into maint
* peterdmv/inets/unix_domain_socket/OTP-14854:
inets: Prepare for release
inets: Skip http_unix_socket test group on Windows
inets: Add unix domain socket support to httpc
Change-Id: I680e41463849a9d79add1385ec2703267be8754c
Diffstat (limited to 'lib/inets/test/http_test_lib.erl')
| -rw-r--r-- | lib/inets/test/http_test_lib.erl | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/lib/inets/test/http_test_lib.erl b/lib/inets/test/http_test_lib.erl index 38e9e4976e..4e119cce04 100644 --- a/lib/inets/test/http_test_lib.erl +++ b/lib/inets/test/http_test_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2015-2015. All Rights Reserved. +%% Copyright Ericsson AB 2015-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -55,6 +55,25 @@ dummy_server_init(Caller, ip_comm, Inet, Extra) -> ]]}, [], ContentCb, Conf, ListenSocket); +dummy_server_init(Caller, unix_socket, Inet, Extra) -> + ContentCb = proplists:get_value(content_cb, Extra), + UnixSocket = proplists:get_value(unix_socket, Extra), + SocketAddr = {local, UnixSocket}, + BaseOpts = [binary, {packet, 0}, {reuseaddr,true}, {active, false}, {nodelay, true}, + {ifaddr, SocketAddr}], + Conf = proplists:get_value(conf, Extra), + {ok, ListenSocket} = gen_tcp:listen(0, [Inet | BaseOpts]), + {ok, Port} = inet:port(ListenSocket), + Caller ! {port, Port}, + dummy_ipcomm_server_loop({httpd_request, parse, [[{max_uri, ?HTTP_MAX_URI_SIZE}, + {max_header, ?HTTP_MAX_HEADER_SIZE}, + {max_version,?HTTP_MAX_VERSION_STRING}, + {max_method, ?HTTP_MAX_METHOD_STRING}, + {max_content_length, ?HTTP_MAX_CONTENT_LENGTH}, + {customize, httpd_custom} + ]]}, + [], ContentCb, Conf, ListenSocket); + dummy_server_init(Caller, ssl, Inet, Extra) -> ContentCb = proplists:get_value(content_cb, Extra), SSLOptions = proplists:get_value(ssl, Extra), |