inets: Forward connection errors with https proxy

httpc should return meaningful error reason disregarding whether
it is being used with http proxy or not

3 files changed, 28 insertions, 4 deletions

diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 205348524a..6e6cc38c06 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1817,13 +1817,13 @@ host_header(_, URI) ->
 tls_upgrade(#state{status = 
 		       {ssl_tunnel, 
 			#request{settings = 
-				     #http_options{ssl = {_, TLSOptions} = SocketType}} = Request},
+				     #http_options{ssl = {_, TLSOptions} = SocketType},
+				     address = Address} = Request},
 		   session = #session{socket = TCPSocket} = Session0,
 		   options = Options} = State) ->
 
     case ssl:connect(TCPSocket, TLSOptions) of
 	{ok, TLSSocket} ->
-	    Address = Request#request.address,
 	    ClientClose = httpc_request:is_client_closing(Request#request.headers),
 	    SessionType = httpc_manager:session_type(Options),
 	    Session = Session0#session{
@@ -1844,7 +1844,11 @@ tls_upgrade(#state{status =
 				   status = new
 				  },
 	    {noreply, activate_request_timeout(NewState)};
-	{error, _Reason} ->
+	{error, Reason} ->
+	    Error = httpc_response:error(Request, {failed_connect,
+						   [{to_address, Address},
+						    {tls, TLSOptions, Reason}]}),
+	    maybe_send_answer(Request, Error, State),
 	    {stop, normal, State#state{request = Request}}
     end.
 
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 ------------------------------------------------
 %%--------------------------------------------------------------------
 
diff --git a/lib/inets/test/httpc_proxy_SUITE_data/server_proxy.sh b/lib/inets/test/httpc_proxy_SUITE_data/server_proxy.sh
index 9d1698c386..473024ae63 100755
--- a/lib/inets/test/httpc_proxy_SUITE_data/server_proxy.sh
+++ b/lib/inets/test/httpc_proxy_SUITE_data/server_proxy.sh
@@ -169,6 +169,8 @@ MaxRequestsPerChild 0
 ViaProxyName "tinyproxy"
 
 ConnectPort $APACHE_HTTPS_PORT
+# to test connect error
+ConnectPort $APACHE_HTTP_PORT
 EOF
 	(tinyproxy -d -c tinyproxy.conf 1>/dev/null 2>&1 </dev/null &)&
 	wait_for_pidfile tinyproxy.pid