aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/httpc_proxy_SUITE.erl
diff options
context:
space:
mode:
authorKirilll Zaborsky <[email protected]>2015-07-24 14:02:48 +0300
committerIngela Anderton Andin <[email protected]>2015-09-08 18:16:47 +0200
commita66d9fb8813d32c7ded2253a7a5904f5b20b5ba8 (patch)
tree481bb6bcd67d3d0e095e543713b4376184df0278 /lib/inets/test/httpc_proxy_SUITE.erl
parentee5587d585052fe7b64c972029a6c68c403b71dc (diff)
downloadotp-a66d9fb8813d32c7ded2253a7a5904f5b20b5ba8.tar.gz
otp-a66d9fb8813d32c7ded2253a7a5904f5b20b5ba8.tar.bz2
otp-a66d9fb8813d32c7ded2253a7a5904f5b20b5ba8.zip
inets: Forward connection errors with https proxy
httpc should return meaningful error reason disregarding whether it is being used with http proxy or not
Diffstat (limited to 'lib/inets/test/httpc_proxy_SUITE.erl')
-rw-r--r--lib/inets/test/httpc_proxy_SUITE.erl20
1 files changed, 19 insertions, 1 deletions
diff --git a/lib/inets/test/httpc_proxy_SUITE.erl b/lib/inets/test/httpc_proxy_SUITE.erl
index 786de1bc42..6d7af4ea5d 100644
--- a/lib/inets/test/httpc_proxy_SUITE.erl
+++ b/lib/inets/test/httpc_proxy_SUITE.erl
@@ -58,7 +58,7 @@ groups() ->
[http_emulate_lower_versions
|local_proxy_cases()]},
{local_proxy_https,[],
- local_proxy_cases()}].
+ local_proxy_cases() ++ local_proxy_https_cases()}].
%% internal functions
@@ -77,6 +77,9 @@ local_proxy_cases() ->
http_stream,
http_not_modified_otp_6821].
+local_proxy_https_cases() ->
+ [https_connect_error].
+
%%--------------------------------------------------------------------
init_per_suite(Config0) ->
@@ -432,6 +435,21 @@ header_value(Name, [{HeaderName,HeaderValue}|Headers]) ->
end.
%%--------------------------------------------------------------------
+https_connect_error(doc) ->
+ ["Error from CONNECT tunnel should be returned"];
+https_connect_error(Config) when is_list(Config) ->
+ {HttpServer,HttpPort} = ?config(http, Config),
+ Method = get,
+ %% using HTTPS scheme with HTTP port to trigger connection error
+ URL = "https://" ++ HttpServer ++ ":" ++
+ integer_to_list(HttpPort) ++ "/index.html",
+ Opts = [],
+ HttpOpts = [],
+ Request = {URL,[]},
+ {error,{failed_connect,[_,{tls,_,_}]}} =
+ httpc:request(Method, Request, HttpOpts, Opts).
+
+%%--------------------------------------------------------------------
%% Internal Functions ------------------------------------------------
%%--------------------------------------------------------------------