Merge branch 'raimo/inets/https-proxy/OTP-10256'

* raimo/inets/https-proxy/OTP-10256:
  inets httpc: Document that RFC 2817 is not supported
  inets: Dialyzer fixes
  inets httpc: TLS via proxy
  inets: Remove obsolete testcases that are now in the proxy suite
  inets: Add tests using external proxy running on localhost

4 files changed, 586 insertions, 446 deletions

diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index b6e7708353..ede649a5a9 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -917,6 +917,10 @@ validate_options([{proxy, Proxy} = Opt| Tail], Acc) ->
     validate_proxy(Proxy),
     validate_options(Tail, [Opt | Acc]);
 
+validate_options([{https_proxy, Proxy} = Opt| Tail], Acc) ->
+    validate_https_proxy(Proxy),
+    validate_options(Tail, [Opt | Acc]);
+
 validate_options([{max_sessions, Value} = Opt| Tail], Acc) ->
     validate_max_sessions(Value),
     validate_options(Tail, [Opt | Acc]);
@@ -979,6 +983,14 @@ validate_proxy({{ProxyHost, ProxyPort}, NoProxy} = Proxy)
 validate_proxy(BadProxy) ->
     bad_option(proxy, BadProxy).
 
+validate_https_proxy({{ProxyHost, ProxyPort}, NoProxy} = Proxy) 
+  when is_list(ProxyHost) andalso 
+       is_integer(ProxyPort) andalso 
+       is_list(NoProxy) ->
+    Proxy;
+validate_https_proxy(BadProxy) ->
+    bad_option(https_proxy, BadProxy).
+
 validate_max_sessions(Value) when is_integer(Value) andalso (Value >= 0) ->
     Value;
 validate_max_sessions(BadValue) ->
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 923213d34d..784a9c0019 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -29,44 +29,44 @@
 %%--------------------------------------------------------------------
 %% Internal Application API
 -export([
-	 start_link/4,
-	 %% connect_and_send/2,
-	 send/2, 
-	 cancel/3,
-	 stream/3, 
-	 stream_next/1,
-	 info/1
-	]).
+         start_link/4,
+         %% connect_and_send/2,
+         send/2, 
+         cancel/3,
+         stream/3, 
+         stream_next/1,
+         info/1
+        ]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
+         terminate/2, code_change/3]).
 
 -record(timers, 
-	{
-	  request_timers = [], % [ref()]
-	  queue_timer          % ref()
-	 }).
+        {
+          request_timers = [], % [ref()]
+          queue_timer          % ref()
+         }).
 
 -record(state, 
-	{
-	  request,                   % #request{}
-	  session,                   % #session{}
-	  status_line,               % {Version, StatusCode, ReasonPharse}
-	  headers,                   % #http_response_h{}
-	  body,                      % binary()
-	  mfa,                       % {Module, Function, Args}
-	  pipeline = queue:new(),    % queue() 
-	  keep_alive = queue:new(),  % queue() 
-	  status,   % undefined | new | pipeline | keep_alive | close | ssl_tunnel
-	  canceled = [],	     % [RequestId]
-	  max_header_size = nolimit, % nolimit | integer() 
-	  max_body_size = nolimit,   % nolimit | integer()
-	  options,                   % #options{}
-	  timers = #timers{},        % #timers{}
-	  profile_name,              % atom() - id of httpc_manager process.
-	  once                       % send | undefined 
-	 }).
+        {
+          request,                   % #request{}
+          session,                   % #session{}
+          status_line,               % {Version, StatusCode, ReasonPharse}
+          headers,                   % #http_response_h{}
+          body,                      % binary()
+          mfa,                       % {Module, Function, Args}
+          pipeline = queue:new(),    % queue() 
+          keep_alive = queue:new(),  % queue() 
+          status,   % undefined | new | pipeline | keep_alive | close | {ssl_tunnel, Request}
+          canceled = [],             % [RequestId]
+          max_header_size = nolimit, % nolimit | integer() 
+          max_body_size = nolimit,   % nolimit | integer()
+          options,                   % #options{}
+          timers = #timers{},        % #timers{}
+          profile_name,              % atom() - id of httpc_manager process.
+          once                       % send | undefined 
+         }).
 
 
 %%====================================================================
@@ -75,8 +75,8 @@
 %%--------------------------------------------------------------------
 %% Function: start_link(Request, Options, ProfileName) -> {ok, Pid}
 %%
-%%	Request = #request{}
-%%	Options =  #options{} 
+%%      Request = #request{}
+%%      Options =  #options{} 
 %%      ProfileName = atom() - id of httpc manager process
 %%
 %% Description: Starts a http-request handler process. Intended to be
@@ -96,11 +96,11 @@
 
 start_link(Parent, Request, Options, ProfileName) ->
     {ok, proc_lib:start_link(?MODULE, init, [[Parent, Request, Options,
-					      ProfileName]])}.
+                                              ProfileName]])}.
 
 %%--------------------------------------------------------------------
 %% Function: send(Request, Pid) -> ok 
-%%	Request = #request{}
+%%      Request = #request{}
 %%      Pid = pid() - the pid of the http-request handler process.
 %%
 %% Description: Uses this handlers session to send a request. Intended
@@ -112,7 +112,7 @@ send(Request, Pid) ->
 
 %%--------------------------------------------------------------------
 %% Function: cancel(RequestId, Pid) -> ok
-%%	RequestId = ref()
+%%      RequestId = ref()
 %%      Pid = pid() -  the pid of the http-request handler process.
 %%
 %% Description: Cancels a request. Intended to be called by the httpc
@@ -142,12 +142,16 @@ stream_next(Pid) ->
 %%     Used for debugging and testing
 %%--------------------------------------------------------------------
 info(Pid) ->
-    call(info, Pid).
-
+    try 
+	call(info, Pid)
+    catch
+	_:_ ->
+	    []
+    end.
 
 %%--------------------------------------------------------------------
 %% Function: stream(BodyPart, Request, Code) -> _
-%%	BodyPart = binary()
+%%      BodyPart = binary()
 %%      Request = #request{}
 %%      Code = integer()
 %%
@@ -167,7 +171,7 @@ stream(BodyPart, #request{stream = Self} = Request, Code)
        ((Self =:= self) orelse (Self =:= {self, once})) ->
     ?hcrt("stream - self", [{stream, Self}, {code, Code}]),
     httpc_response:send(Request#request.from, 
-			{Request#request.id, stream, BodyPart}),
+                        {Request#request.id, stream, BodyPart}),
     {<<>>, Request};
 
 %% Stream to file
@@ -177,11 +181,11 @@ stream(BodyPart, #request{stream = Filename} = Request, Code)
   when ((Code =:= 200) orelse (Code =:= 206)) andalso is_list(Filename) -> 
     ?hcrt("stream - filename", [{stream, Filename}, {code, Code}]),
     case file:open(Filename, [write, raw, append, delayed_write]) of
-	{ok, Fd} ->
-	    ?hcrt("stream - file open ok", [{fd, Fd}]),
-	    stream(BodyPart, Request#request{stream = Fd}, 200);
-	{error, Reason} ->
-	    exit({stream_to_file_failed, Reason})
+        {ok, Fd} ->
+            ?hcrt("stream - file open ok", [{fd, Fd}]),
+            stream(BodyPart, Request#request{stream = Fd}, 200);
+        {error, Reason} ->
+            exit({stream_to_file_failed, Reason})
     end;
 
 %% Stream to file
@@ -189,10 +193,10 @@ stream(BodyPart, #request{stream = Fd} = Request, Code)
   when ((Code =:= 200) orelse (Code =:= 206)) -> 
     ?hcrt("stream to file", [{stream, Fd}, {code, Code}]),
     case file:write(Fd, BodyPart) of
-	ok ->
-	    {<<>>, Request};
-	{error, Reason} ->
-	    exit({stream_to_file_failed, Reason})
+        ok ->
+            {<<>>, Request};
+        {error, Reason} ->
+            exit({stream_to_file_failed, Reason})
     end;
 
 stream(BodyPart, Request,_) -> % only 200 and 206 responses can be streamed
@@ -208,7 +212,7 @@ stream(BodyPart, Request,_) -> % only 200 and 206 responses can be streamed
 %% Function: init([Options, ProfileName]) -> {ok, State} | 
 %%                       {ok, State, Timeout} | ignore | {stop, Reason}
 %%
-%%	Options =  #options{} 
+%%      Options =  #options{} 
 %%      ProfileName = atom() - id of httpc manager process
 %%
 %% Description: Initiates the httpc_handler process 
@@ -224,20 +228,19 @@ init([Parent, Request, Options, ProfileName]) ->
     %% Do not let initial tcp-connection block the manager-process
     proc_lib:init_ack(Parent, self()),
     handle_verbose(Options#options.verbose),
-    Address = handle_proxy(Request#request.address, Options#options.proxy),
+    ProxyOptions = handle_proxy_options(Request#request.scheme, Options),
+    Address = handle_proxy(Request#request.address, ProxyOptions),
     {ok, State} =
-	case {Address /= Request#request.address, Request#request.scheme} of
-	    {true, https} ->
-		Error = https_through_proxy_is_not_currently_supported,
-		self() ! {init_error,
-			  Error, httpc_response:error(Request, Error)},
-		{ok, #state{request = Request, options = Options,
-			    status = ssl_tunnel}};
-	    {_, _} ->
-		connect_and_send_first_request(Address, Request,
-				   #state{options = Options,
-					  profile_name = ProfileName})
-	end,
+        case {Address /= Request#request.address, Request#request.scheme} of
+            {true, https} ->
+                connect_and_send_upgrade_request(Address, Request,
+                                                 #state{options = Options,
+                                                        profile_name = ProfileName});
+            {_, _} ->
+                connect_and_send_first_request(Address, Request,
+                                   #state{options = Options,
+                                          profile_name = ProfileName})
+        end,
     gen_server:enter_loop(?MODULE, [], State).
 
 %%--------------------------------------------------------------------
@@ -250,139 +253,139 @@ init([Parent, Request, Options, ProfileName]) ->
 %% Description: Handling call messages
 %%--------------------------------------------------------------------
 handle_call(#request{address = Addr} = Request, _, 
-	    #state{status  = Status,
-		   session = #session{type = pipeline} = Session,
-		   timers  = Timers,
-		   options = #options{proxy = Proxy} = _Options, 
-		   profile_name = ProfileName} = State) 
+            #state{status  = Status,
+                   session = #session{type = pipeline} = Session,
+                   timers  = Timers,
+                   options = #options{proxy = Proxy} = _Options, 
+                   profile_name = ProfileName} = State) 
   when Status =/= undefined ->
 
     ?hcrv("new request on a pipeline session", 
-	  [{request, Request}, 
-	   {profile, ProfileName}, 
-	   {status,  Status}, 
-	   {timers,  Timers}]),
+          [{request, Request}, 
+           {profile, ProfileName}, 
+           {status,  Status}, 
+           {timers,  Timers}]),
 
     Address = handle_proxy(Addr, Proxy),
 
     case httpc_request:send(Address, Session, Request) of
         ok ->
 
-	    ?hcrd("request sent", []),
+            ?hcrd("request sent", []),
 
-	    %% Activate the request time out for the new request
-	    NewState = 
-		activate_request_timeout(State#state{request = Request}),
+            %% Activate the request time out for the new request
+            NewState = 
+                activate_request_timeout(State#state{request = Request}),
 
-	    ClientClose = 
-		httpc_request:is_client_closing(Request#request.headers),
+            ClientClose = 
+                httpc_request:is_client_closing(Request#request.headers),
 
             case State#state.request of
                 #request{} -> %% Old request not yet finished
-		    ?hcrd("old request still not finished", []),
-		    %% Make sure to use the new value of timers in state
-		    NewTimers   = NewState#state.timers,
+                    ?hcrd("old request still not finished", []),
+                    %% Make sure to use the new value of timers in state
+                    NewTimers   = NewState#state.timers,
                     NewPipeline = queue:in(Request, State#state.pipeline),
-		    NewSession  = 
-			Session#session{queue_length = 
-					%% Queue + current
-					queue:len(NewPipeline) + 1,
-					client_close = ClientClose},
-		    insert_session(NewSession, ProfileName),
-		    ?hcrd("session updated", []),
+                    NewSession  = 
+                        Session#session{queue_length = 
+                                        %% Queue + current
+                                        queue:len(NewPipeline) + 1,
+                                        client_close = ClientClose},
+                    insert_session(NewSession, ProfileName),
+                    ?hcrd("session updated", []),
                     {reply, ok, State#state{pipeline = NewPipeline,
-					    session  = NewSession,
-					    timers   = NewTimers}};
-		undefined ->
-		    %% Note: tcp-message receiving has already been
-		    %% activated by handle_pipeline/2. 
-		    ?hcrd("no current request", []),
-		    cancel_timer(Timers#timers.queue_timer, 
-				 timeout_queue),
-		    NewSession = 
-			Session#session{queue_length = 1,
-					client_close = ClientClose},
-		    httpc_manager:insert_session(NewSession, ProfileName),
-		    Relaxed = 
-			(Request#request.settings)#http_options.relaxed, 
-		    MFA = {httpc_response, parse, 
-			   [State#state.max_header_size, Relaxed]}, 
-		    NewTimers = Timers#timers{queue_timer = undefined}, 
-		    ?hcrd("session created", []),
-		    {reply, ok, NewState#state{request = Request,
-					       session = NewSession,
-					       mfa     = MFA,
-					       timers  = NewTimers}}
-	    end;
-	{error, Reason} ->
-	    ?hcri("failed sending request", [{reason, Reason}]),
-	    {reply, {pipeline_failed, Reason}, State}
+                                            session  = NewSession,
+                                            timers   = NewTimers}};
+                undefined ->
+                    %% Note: tcp-message receiving has already been
+                    %% activated by handle_pipeline/2. 
+                    ?hcrd("no current request", []),
+                    cancel_timer(Timers#timers.queue_timer, 
+                                 timeout_queue),
+                    NewSession = 
+                        Session#session{queue_length = 1,
+                                        client_close = ClientClose},
+                    httpc_manager:insert_session(NewSession, ProfileName),
+                    Relaxed = 
+                        (Request#request.settings)#http_options.relaxed, 
+                    MFA = {httpc_response, parse, 
+                           [State#state.max_header_size, Relaxed]}, 
+                    NewTimers = Timers#timers{queue_timer = undefined}, 
+                    ?hcrd("session created", []),
+                    {reply, ok, NewState#state{request = Request,
+                                               session = NewSession,
+                                               mfa     = MFA,
+                                               timers  = NewTimers}}
+            end;
+        {error, Reason} ->
+            ?hcri("failed sending request", [{reason, Reason}]),
+            {reply, {pipeline_failed, Reason}, State}
     end;
 
 handle_call(#request{address = Addr} = Request, _, 
-	    #state{status  = Status,
-		   session = #session{type = keep_alive} = Session,
-		   timers  = Timers,
-		   options = #options{proxy = Proxy} = _Options,
-		   profile_name = ProfileName} = State) 
+            #state{status  = Status,
+                   session = #session{type = keep_alive} = Session,
+                   timers  = Timers,
+                   options = #options{proxy = Proxy} = _Options,
+                   profile_name = ProfileName} = State) 
   when Status =/= undefined ->
     
     ?hcrv("new request on a keep-alive session", 
-	  [{request, Request}, 
-	   {profile, ProfileName}, 
-	   {status,  Status}]),
+          [{request, Request}, 
+           {profile, ProfileName}, 
+           {status,  Status}]),
 
     Address = handle_proxy(Addr, Proxy),
     case httpc_request:send(Address, Session, Request) of
-	ok ->
+        ok ->
 
-	    ?hcrd("request sent", []),
+            ?hcrd("request sent", []),
 
-	    %% Activate the request time out for the new request
-	    NewState = 
-		activate_request_timeout(State#state{request = Request}),
+            %% Activate the request time out for the new request
+            NewState = 
+                activate_request_timeout(State#state{request = Request}),
 
-	    ClientClose = 
-		httpc_request:is_client_closing(Request#request.headers),
+            ClientClose = 
+                httpc_request:is_client_closing(Request#request.headers),
 
-	    case State#state.request of
-		#request{} -> %% Old request not yet finished
-		    %% Make sure to use the new value of timers in state
-		    ?hcrd("old request still not finished", []),
-		    NewTimers    = NewState#state.timers,
+            case State#state.request of
+                #request{} -> %% Old request not yet finished
+                    %% Make sure to use the new value of timers in state
+                    ?hcrd("old request still not finished", []),
+                    NewTimers    = NewState#state.timers,
                     NewKeepAlive = queue:in(Request, State#state.keep_alive),
-		    NewSession   = 
-			Session#session{queue_length = 
-					%% Queue + current
-					queue:len(NewKeepAlive) + 1,
-					client_close = ClientClose},
-		    insert_session(NewSession, ProfileName),
-		    ?hcrd("session updated", []),
+                    NewSession   = 
+                        Session#session{queue_length = 
+                                        %% Queue + current
+                                        queue:len(NewKeepAlive) + 1,
+                                        client_close = ClientClose},
+                    insert_session(NewSession, ProfileName),
+                    ?hcrd("session updated", []),
                     {reply, ok, State#state{keep_alive = NewKeepAlive,
-					    session    = NewSession,
-					    timers     = NewTimers}};
-		undefined ->
-		    %% Note: tcp-message reciving has already been
-		    %% activated by handle_pipeline/2. 
-		    ?hcrd("no current request", []),
-		    cancel_timer(Timers#timers.queue_timer, 
-				 timeout_queue),
-		    NewSession = 
-			Session#session{queue_length = 1,
-					client_close = ClientClose},
-		    insert_session(NewSession, ProfileName),
-		    Relaxed = 
-			(Request#request.settings)#http_options.relaxed,
-		    MFA = {httpc_response, parse,
-			   [State#state.max_header_size, Relaxed]}, 
-		    {reply, ok, NewState#state{request = Request,
-					       session = NewSession, 
-					       mfa     = MFA}}
-	    end;
+                                            session    = NewSession,
+                                            timers     = NewTimers}};
+                undefined ->
+                    %% Note: tcp-message reciving has already been
+                    %% activated by handle_pipeline/2. 
+                    ?hcrd("no current request", []),
+                    cancel_timer(Timers#timers.queue_timer, 
+                                 timeout_queue),
+                    NewSession = 
+                        Session#session{queue_length = 1,
+                                        client_close = ClientClose},
+                    insert_session(NewSession, ProfileName),
+                    Relaxed = 
+                        (Request#request.settings)#http_options.relaxed,
+                    MFA = {httpc_response, parse,
+                           [State#state.max_header_size, Relaxed]}, 
+                    {reply, ok, NewState#state{request = Request,
+                                               session = NewSession, 
+                                               mfa     = MFA}}
+            end;
 
-	{error, Reason} ->
-	    ?hcri("failed sending request", [{reason, Reason}]),
-	    {reply, {request_failed, Reason}, State}
+        {error, Reason} ->
+            ?hcri("failed sending request", [{reason, Reason}]),
+            {reply, {request_failed, Reason}, State}
     end;
 
 
@@ -411,25 +414,25 @@ handle_call(info, _, State) ->
 %% request as if it was never issued as in this case the request will
 %% not have been sent. 
 handle_cast({cancel, RequestId, From},
-	    #state{request      = #request{id = RequestId} = Request,
-		   profile_name = ProfileName,
-		   canceled     = Canceled} = State) ->
+            #state{request      = #request{id = RequestId} = Request,
+                   profile_name = ProfileName,
+                   canceled     = Canceled} = State) ->
     ?hcrv("cancel current request", [{request_id, RequestId}, 
-				     {profile,    ProfileName},
-				     {canceled,   Canceled}]),
+                                     {profile,    ProfileName},
+                                     {canceled,   Canceled}]),
     httpc_manager:request_canceled(RequestId, ProfileName, From),
     ?hcrv("canceled", []),
     {stop, normal, 
      State#state{canceled = [RequestId | Canceled],
-		 request  = Request#request{from = answer_sent}}};
+                 request  = Request#request{from = answer_sent}}};
 handle_cast({cancel, RequestId, From},
-	    #state{profile_name = ProfileName,
-		   request      = #request{id = CurrId},
-		   canceled     = Canceled} = State) ->
+            #state{profile_name = ProfileName,
+                   request      = #request{id = CurrId},
+                   canceled     = Canceled} = State) ->
     ?hcrv("cancel", [{request_id, RequestId},
-		     {curr_req_id, CurrId},
-		     {profile, ProfileName},
-		     {canceled,   Canceled}]),
+                     {curr_req_id, CurrId},
+                     {profile, ProfileName},
+                     {canceled,   Canceled}]),
     httpc_manager:request_canceled(RequestId, ProfileName, From),
     ?hcrv("canceled", []),
     {noreply, State#state{canceled = [RequestId | Canceled]}};
@@ -446,94 +449,94 @@ handle_cast(stream_next, #state{session = Session} = State) ->
 %% Description: Handling all non call/cast messages
 %%--------------------------------------------------------------------
 handle_info({Proto, _Socket, Data}, 
-	    #state{mfa = {Module, Function, Args}, 
-		   request = #request{method = Method, 
-				      stream = Stream} = Request, 
-		   session = Session, 
-		   status_line = StatusLine} = State) 
+            #state{mfa = {Module, Function, Args}, 
+                   request = #request{method = Method, 
+                                      stream = Stream} = Request, 
+                   session = Session, 
+                   status_line = StatusLine} = State) 
   when (Proto =:= tcp) orelse 
        (Proto =:= ssl) orelse 
        (Proto =:= httpc_handler) ->
 
     ?hcri("received data", [{proto,       Proto}, 
-			    {module,      Module}, 
-			    {function,    Function}, 
-			    {method,      Method}, 
-			    {stream,      Stream}, 
-			    {session,     Session}, 
-			    {status_line, StatusLine}]),
+                            {module,      Module}, 
+                            {function,    Function}, 
+                            {method,      Method}, 
+                            {stream,      Stream}, 
+                            {session,     Session}, 
+                            {status_line, StatusLine}]),
 
     FinalResult = 
-	try Module:Function([Data | Args]) of
-	    {ok, Result} ->
-		?hcrd("data processed - ok", []),
-		handle_http_msg(Result, State); 
-	    {_, whole_body, _} when Method =:= head ->
-		?hcrd("data processed - whole body", []),
-		handle_response(State#state{body = <<>>}); 
-	    {Module, whole_body, [Body, Length]} ->
-		?hcrd("data processed - whole body", [{length, Length}]),
-		{_, Code, _} = StatusLine,
-		{NewBody, NewRequest} = stream(Body, Request, Code),
-		%% When we stream we will not keep the already
-		%% streamed data, that would be a waste of memory.
-		NewLength = 
-		    case Stream of
-			none ->   
-			    Length;
-			_ ->
-			    Length - size(Body)			    
-		    end,
-		
-		NewState = next_body_chunk(State),
-		NewMFA   = {Module, whole_body, [NewBody, NewLength]}, 
-		{noreply, NewState#state{mfa     = NewMFA,
-					 request = NewRequest}};
-	    NewMFA ->
-		?hcrd("data processed - new mfa", []),
-		activate_once(Session),
-		{noreply, State#state{mfa = NewMFA}}
-	catch
-	    exit:_Exit ->
-		?hcrd("data processing exit", [{exit, _Exit}]),
-		ClientReason = {could_not_parse_as_http, Data}, 
-		ClientErrMsg = httpc_response:error(Request, ClientReason),
-		NewState     = answer_request(Request, ClientErrMsg, State),
-		{stop, normal, NewState};
-	    error:_Error ->    
-		?hcrd("data processing error", [{error, _Error}]),
-		ClientReason = {could_not_parse_as_http, Data}, 
-		ClientErrMsg = httpc_response:error(Request, ClientReason),
-		NewState     = answer_request(Request, ClientErrMsg, State),   
-		{stop, normal, NewState}
-	
-	end,
+        try Module:Function([Data | Args]) of
+            {ok, Result} ->
+                ?hcrd("data processed - ok", []),
+                handle_http_msg(Result, State); 
+            {_, whole_body, _} when Method =:= head ->
+                ?hcrd("data processed - whole body", []),
+                handle_response(State#state{body = <<>>}); 
+            {Module, whole_body, [Body, Length]} ->
+                ?hcrd("data processed - whole body", [{length, Length}]),
+                {_, Code, _} = StatusLine,
+                {NewBody, NewRequest} = stream(Body, Request, Code),
+                %% When we stream we will not keep the already
+                %% streamed data, that would be a waste of memory.
+                NewLength = 
+                    case Stream of
+                        none ->   
+                            Length;
+                        _ ->
+                            Length - size(Body)                     
+                    end,
+                
+                NewState = next_body_chunk(State),
+                NewMFA   = {Module, whole_body, [NewBody, NewLength]}, 
+                {noreply, NewState#state{mfa     = NewMFA,
+                                         request = NewRequest}};
+            NewMFA ->
+                ?hcrd("data processed - new mfa", []),
+                activate_once(Session),
+                {noreply, State#state{mfa = NewMFA}}
+        catch
+            exit:_Exit ->
+                ?hcrd("data processing exit", [{exit, _Exit}]),
+                ClientReason = {could_not_parse_as_http, Data}, 
+                ClientErrMsg = httpc_response:error(Request, ClientReason),
+                NewState     = answer_request(Request, ClientErrMsg, State),
+                {stop, normal, NewState};
+            error:_Error ->    
+                ?hcrd("data processing error", [{error, _Error}]),
+                ClientReason = {could_not_parse_as_http, Data}, 
+                ClientErrMsg = httpc_response:error(Request, ClientReason),
+                NewState     = answer_request(Request, ClientErrMsg, State),   
+                {stop, normal, NewState}
+        
+        end,
     ?hcri("data processed", [{final_result, FinalResult}]),
     FinalResult;
 
 
 handle_info({Proto, Socket, Data}, 
-	    #state{mfa          = MFA, 
-		   request      = Request, 
-		   session      = Session, 
-		   status       = Status,
-		   status_line  = StatusLine, 
-		   profile_name = Profile} = State) 
+            #state{mfa          = MFA, 
+                   request      = Request, 
+                   session      = Session, 
+                   status       = Status,
+                   status_line  = StatusLine, 
+                   profile_name = Profile} = State) 
   when (Proto =:= tcp) orelse 
        (Proto =:= ssl) orelse 
        (Proto =:= httpc_handler) ->
 
     error_logger:warning_msg("Received unexpected ~p data on ~p"
-			     "~n   Data:       ~p"
-			     "~n   MFA:        ~p"
-			     "~n   Request:    ~p"
-			     "~n   Session:    ~p"
-			     "~n   Status:     ~p"
-			     "~n   StatusLine: ~p"
-			     "~n   Profile:    ~p"
-			     "~n", 
-			     [Proto, Socket, Data, MFA, 
-			      Request, Session, Status, StatusLine, Profile]),
+                             "~n   Data:       ~p"
+                             "~n   MFA:        ~p"
+                             "~n   Request:    ~p"
+                             "~n   Session:    ~p"
+                             "~n   Status:     ~p"
+                             "~n   StatusLine: ~p"
+                             "~n   Profile:    ~p"
+                             "~n", 
+                             [Proto, Socket, Data, MFA, 
+                              Request, Session, Status, StatusLine, Profile]),
 
     {noreply, State};
 
@@ -572,45 +575,45 @@ handle_info({ssl_error, _, _} = Reason, State) ->
 %% Internally, to a request handling process, a request timeout is
 %% seen as a canceled request.
 handle_info({timeout, RequestId}, 
-	    #state{request      = #request{id = RequestId} = Request,
-		   canceled     = Canceled,
-		   profile_name = ProfileName} = State) ->
+            #state{request      = #request{id = RequestId} = Request,
+                   canceled     = Canceled,
+                   profile_name = ProfileName} = State) ->
     ?hcri("timeout of current request", [{id, RequestId}]),
     httpc_response:send(Request#request.from, 
-			httpc_response:error(Request, timeout)),
+                        httpc_response:error(Request, timeout)),
     httpc_manager:request_done(RequestId, ProfileName),
     ?hcrv("response (timeout) sent - now terminate", []),
     {stop, normal, 
      State#state{request  = Request#request{from = answer_sent},
-		 canceled = [RequestId | Canceled]}};
+                 canceled = [RequestId | Canceled]}};
 
 handle_info({timeout, RequestId}, 
-	    #state{canceled     = Canceled,
-		   profile_name = ProfileName} = State) ->
+            #state{canceled     = Canceled,
+                   profile_name = ProfileName} = State) ->
     ?hcri("timeout", [{id, RequestId}]),
     Filter = 
-	fun(#request{id = Id, from = From} = Request) when Id =:= RequestId ->
-		?hcrv("found request", [{id, Id}, {from, From}]),
-		%% Notify the owner
-		httpc_response:send(From, 
-				    httpc_response:error(Request, timeout)),
-		httpc_manager:request_done(RequestId, ProfileName),
-		?hcrv("response (timeout) sent", []),
-		[Request#request{from = answer_sent}];
-	   (_) ->
-		true
-	end,
+        fun(#request{id = Id, from = From} = Request) when Id =:= RequestId ->
+                ?hcrv("found request", [{id, Id}, {from, From}]),
+                %% Notify the owner
+                httpc_response:send(From, 
+                                    httpc_response:error(Request, timeout)),
+                httpc_manager:request_done(RequestId, ProfileName),
+                ?hcrv("response (timeout) sent", []),
+                [Request#request{from = answer_sent}];
+           (_) ->
+                true
+        end,
     case State#state.status of
-	pipeline ->
-	    ?hcrd("pipeline", []),
-	    Pipeline = queue:filter(Filter, State#state.pipeline),
-	    {noreply, State#state{canceled = [RequestId | Canceled],
-				  pipeline = Pipeline}};
-	keep_alive ->
-	    ?hcrd("keep_alive", []),
-	    KeepAlive = queue:filter(Filter, State#state.keep_alive),
-	    {noreply, State#state{canceled   = [RequestId | Canceled],
-				  keep_alive = KeepAlive}}
+        pipeline ->
+            ?hcrd("pipeline", []),
+            Pipeline = queue:filter(Filter, State#state.pipeline),
+            {noreply, State#state{canceled = [RequestId | Canceled],
+                                  pipeline = Pipeline}};
+        keep_alive ->
+            ?hcrd("keep_alive", []),
+            KeepAlive = queue:filter(Filter, State#state.keep_alive),
+            {noreply, State#state{canceled   = [RequestId | Canceled],
+                                  keep_alive = KeepAlive}}
     end;
 
 handle_info(timeout_queue, State = #state{request = undefined}) ->
@@ -619,11 +622,11 @@ handle_info(timeout_queue, State = #state{request = undefined}) ->
 %% Timing was such as the pipeline_timout was not canceled!
 handle_info(timeout_queue, #state{timers = Timers} = State) ->
     {noreply, State#state{timers = 
-			  Timers#timers{queue_timer = undefined}}};
+                          Timers#timers{queue_timer = undefined}}};
 
 %% Setting up the connection to the server somehow failed. 
 handle_info({init_error, Tag, ClientErrMsg},
-	    State = #state{request = Request}) ->
+            State = #state{request = Request}) ->
     ?hcrv("init error", [{tag, Tag}, {client_error, ClientErrMsg}]),
     NewState = answer_request(Request, ClientErrMsg, State),
     {stop, normal, NewState};
@@ -647,21 +650,21 @@ handle_info({'EXIT', _, _}, State) ->
 
 %% Init error there is no socket to be closed.
 terminate(normal, 
-	  #state{request = Request, 
-		 session = {send_failed, AReason} = Reason} = State) ->
+          #state{request = Request, 
+                 session = {send_failed, AReason} = Reason} = State) ->
     ?hcrd("terminate", [{send_reason, AReason}, {request, Request}]),
     maybe_send_answer(Request, 
-		      httpc_response:error(Request, Reason), 
-		      State),
+                      httpc_response:error(Request, Reason), 
+                      State),
     ok; 
 
 terminate(normal, 
-	  #state{request = Request, 
-		 session = {connect_failed, AReason} = Reason} = State) ->
+          #state{request = Request, 
+                 session = {connect_failed, AReason} = Reason} = State) ->
     ?hcrd("terminate", [{connect_reason, AReason}, {request, Request}]),
     maybe_send_answer(Request, 
-		      httpc_response:error(Request, Reason), 
-		      State),
+                      httpc_response:error(Request, Reason), 
+                      State),
     ok; 
 
 terminate(normal, #state{session = undefined}) ->
@@ -670,21 +673,21 @@ terminate(normal, #state{session = undefined}) ->
 %% Init error sending, no session information has been setup but
 %% there is a socket that needs closing.
 terminate(normal, 
-	  #state{session = #session{id = undefined} = Session}) ->  
+          #state{session = #session{id = undefined} = Session}) ->  
     close_socket(Session);
 
 %% Socket closed remotely
 terminate(normal, 
-	  #state{session = #session{socket      = {remote_close, Socket},
-				    socket_type = SocketType, 
-				    id          = Id}, 
-		 profile_name = ProfileName,
-		 request      = Request,
-		 timers       = Timers,
-		 pipeline     = Pipeline,
-		 keep_alive   = KeepAlive} = State) ->  
+          #state{session = #session{socket      = {remote_close, Socket},
+                                    socket_type = SocketType, 
+                                    id          = Id}, 
+                 profile_name = ProfileName,
+                 request      = Request,
+                 timers       = Timers,
+                 pipeline     = Pipeline,
+                 keep_alive   = KeepAlive} = State) ->  
     ?hcrt("terminate(normal) - remote close", 
-	  [{id, Id}, {profile, ProfileName}]),
+          [{id, Id}, {profile, ProfileName}]),
 
     %% Clobber session
     (catch httpc_manager:delete_session(Id, ProfileName)),
@@ -702,15 +705,15 @@ terminate(normal,
     http_transport:close(SocketType, Socket);
 
 terminate(Reason, #state{session = #session{id          = Id,
-					    socket      = Socket, 
-					    socket_type = SocketType},
-		    request      = undefined,
-		    profile_name = ProfileName,
-		    timers       = Timers,
-		    pipeline     = Pipeline,
-		    keep_alive   = KeepAlive} = State) -> 
+                                            socket      = Socket, 
+                                            socket_type = SocketType},
+                    request      = undefined,
+                    profile_name = ProfileName,
+                    timers       = Timers,
+                    pipeline     = Pipeline,
+                    keep_alive   = KeepAlive} = State) -> 
     ?hcrt("terminate", 
-	  [{id, Id}, {profile, ProfileName}, {reason, Reason}]),
+          [{id, Id}, {profile, ProfileName}, {reason, Reason}]),
 
     %% Clobber session
     (catch httpc_manager:delete_session(Id, ProfileName)),
@@ -728,16 +731,16 @@ terminate(Reason, #state{request = undefined}) ->
 terminate(Reason, #state{request = Request} = State) -> 
     ?hcrd("terminate", [{reason, Reason}, {request, Request}]),
     NewState = maybe_send_answer(Request, 
-				 httpc_response:error(Request, Reason), 
-				 State),
+                                 httpc_response:error(Request, Reason), 
+                                 State),
     terminate(Reason, NewState#state{request = undefined}).
 
 maybe_retry_queue(Q, State) ->
     case queue:is_empty(Q) of 
-	false ->
-	    retry_pipeline(queue:to_list(Q), State);
-	true ->
-	    ok
+        false ->
+            retry_pipeline(queue:to_list(Q), State);
+        true ->
+            ok
     end.
     
 maybe_send_answer(#request{from = answer_sent}, _Reason, State) ->
@@ -761,44 +764,44 @@ deliver_answer(Request) ->
 %%--------------------------------------------------------------------
 
 code_change(_, 
-	    #state{session      = OldSession, 
-		   profile_name = ProfileName} = State, 
-	    upgrade_from_pre_5_8_1) ->
+            #state{session      = OldSession, 
+                   profile_name = ProfileName} = State, 
+            upgrade_from_pre_5_8_1) ->
     case OldSession of
-	{session, 
-	 Id, ClientClose, Scheme, Socket, SocketType, QueueLen, Type} ->
-	    NewSession = #session{id           = Id, 
-				  client_close = ClientClose, 
-				  scheme       = Scheme, 
-				  socket       = Socket, 
-				  socket_type  = SocketType,
-				  queue_length = QueueLen, 
-				  type         = Type}, 
-	    insert_session(NewSession, ProfileName), 
-	    {ok, State#state{session = NewSession}};
-	_ -> 
-	    {ok, State}
+        {session, 
+         Id, ClientClose, Scheme, Socket, SocketType, QueueLen, Type} ->
+            NewSession = #session{id           = Id, 
+                                  client_close = ClientClose, 
+                                  scheme       = Scheme, 
+                                  socket       = Socket, 
+                                  socket_type  = SocketType,
+                                  queue_length = QueueLen, 
+                                  type         = Type}, 
+            insert_session(NewSession, ProfileName), 
+            {ok, State#state{session = NewSession}};
+        _ -> 
+            {ok, State}
     end;
 
 code_change(_, 
-	    #state{session      = OldSession, 
-		   profile_name = ProfileName} = State, 
-	    downgrade_to_pre_5_8_1) ->
+            #state{session      = OldSession, 
+                   profile_name = ProfileName} = State, 
+            downgrade_to_pre_5_8_1) ->
     case OldSession of
-	#session{id           = Id, 
-		 client_close = ClientClose, 
-		 scheme       = Scheme, 
-		 socket       = Socket, 
-		 socket_type  = SocketType,
-		 queue_length = QueueLen, 
-		 type         = Type} ->
-	    NewSession = {session, 
-			  Id, ClientClose, Scheme, Socket, SocketType, 
-			  QueueLen, Type},
-	    insert_session(NewSession, ProfileName), 
-	    {ok, State#state{session = NewSession}};
-	_ -> 
-	    {ok, State}
+        #session{id           = Id, 
+                 client_close = ClientClose, 
+                 scheme       = Scheme, 
+                 socket       = Socket, 
+                 socket_type  = SocketType,
+                 queue_length = QueueLen, 
+                 type         = Type} ->
+            NewSession = {session, 
+                          Id, ClientClose, Scheme, Socket, SocketType, 
+                          QueueLen, Type},
+            insert_session(NewSession, ProfileName), 
+            {ok, State#state{session = NewSession}};
+        _ -> 
+            {ok, State}
     end;
 
 code_change(_, State, _) ->
@@ -806,22 +809,22 @@ code_change(_, State, _) ->
 
 
 %% new_http_options({http_options, TimeOut, AutoRedirect, SslOpts,
-%% 		  Auth, Relaxed}) ->
+%%                Auth, Relaxed}) ->
 %%     {http_options, "HTTP/1.1", TimeOut, AutoRedirect, SslOpts,
 %%      Auth, Relaxed}.
 
 %% old_http_options({http_options, _, TimeOut, AutoRedirect,
-%% 		  SslOpts, Auth, Relaxed}) ->
+%%                SslOpts, Auth, Relaxed}) ->
 %%     {http_options, TimeOut, AutoRedirect, SslOpts, Auth, Relaxed}.
 
 %% new_queue(Queue, Fun) ->
 %%     List = queue:to_list(Queue),
 %%     NewList = 
-%% 	lists:map(fun(Request) ->
-%% 			  Settings = 
-%% 			      Fun(Request#request.settings),
-%% 			  Request#request{settings = Settings}
-%% 		  end, List),
+%%      lists:map(fun(Request) ->
+%%                        Settings = 
+%%                            Fun(Request#request.settings),
+%%                        Request#request{settings = Settings}
+%%                end, List),
 %%     queue:from_list(NewList).
     
 
@@ -830,97 +833,121 @@ code_change(_, State, _) ->
 %%%--------------------------------------------------------------------
 
 connect(SocketType, ToAddress, 
-	#options{ipfamily    = IpFamily,
-		 ip          = FromAddress,
-		 port        = FromPort,
-		 socket_opts = Opts0}, Timeout) ->
+        #options{ipfamily    = IpFamily,
+                 ip          = FromAddress,
+                 port        = FromPort,
+                 socket_opts = Opts0}, Timeout) ->
     Opts1 = 
-	case FromPort of
-	    default ->
-		Opts0;
-	    _ ->
-		[{port, FromPort} | Opts0]
-	end,
+        case FromPort of
+            default ->
+                Opts0;
+            _ ->
+                [{port, FromPort} | Opts0]
+        end,
     Opts2 = 
-	case FromAddress of
-	    default ->
-		Opts1;
-	    _ ->
-		[{ip, FromAddress} | Opts1]
-	end,
+        case FromAddress of
+            default ->
+                Opts1;
+            _ ->
+                [{ip, FromAddress} | Opts1]
+        end,
     case IpFamily of
-	inet6fb4 ->
-	    Opts3 = [inet6 | Opts2],
-	    case http_transport:connect(SocketType, 
-					ToAddress, Opts3, Timeout) of
-		{error, Reason6} ->
-		    Opts4 = [inet | Opts2], 
-		    case http_transport:connect(SocketType, 
-						ToAddress, Opts4, Timeout) of
-			{error, Reason4} ->
-			    {error, {failed_connect, 
-				     [{to_address, ToAddress}, 
-				      {inet6, Opts3, Reason6}, 
-				      {inet,  Opts4, Reason4}]}};
-			OK ->
-			    OK
-		    end;
-		OK ->
-		    OK
-	    end;
-	_ ->
-	    Opts3 = [IpFamily | Opts2], 
-	    case http_transport:connect(SocketType, ToAddress, Opts3, Timeout) of
-		{error, Reason} ->
-		    {error, {failed_connect, [{to_address, ToAddress}, 
-					      {IpFamily, Opts3, Reason}]}};
-		Else ->
-		    Else
-	    end
+        inet6fb4 ->
+            Opts3 = [inet6 | Opts2],
+            case http_transport:connect(SocketType, 
+                                        ToAddress, Opts3, Timeout) of
+                {error, Reason6} ->
+                    Opts4 = [inet | Opts2], 
+                    case http_transport:connect(SocketType, 
+                                                ToAddress, Opts4, Timeout) of
+                        {error, Reason4} ->
+                            {error, {failed_connect, 
+                                     [{to_address, ToAddress}, 
+                                      {inet6, Opts3, Reason6}, 
+                                      {inet,  Opts4, Reason4}]}};
+                        OK ->
+                            OK
+                    end;
+                OK ->
+                    OK
+            end;
+        _ ->
+            Opts3 = [IpFamily | Opts2], 
+            case http_transport:connect(SocketType, ToAddress, Opts3, Timeout) of
+                {error, Reason} ->
+                    {error, {failed_connect, [{to_address, ToAddress}, 
+                                              {IpFamily, Opts3, Reason}]}};
+                Else ->
+                    Else
+            end
     end.
 
 connect_and_send_first_request(Address, Request, #state{options = Options} = State) ->
     SocketType  = socket_type(Request),
     ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
     ?hcri("connect",
-	  [{address, Address}, {request, Request}, {options, Options}]),
+          [{address, Address}, {request, Request}, {options, Options}]),
     case connect(SocketType, Address, Options, ConnTimeout) of
-	{ok, Socket} ->
-	    ClientClose =
-			httpc_request:is_client_closing(
-			  Request#request.headers),
+        {ok, Socket} ->
+            ClientClose =
+                        httpc_request:is_client_closing(
+                          Request#request.headers),
+            SessionType = httpc_manager:session_type(Options),
+            SocketType  = socket_type(Request),
+            Session = #session{id = {Request#request.address, self()},
+                               scheme = Request#request.scheme,
+                               socket = Socket,
+                               socket_type = SocketType,
+                               client_close = ClientClose,
+                               type = SessionType},
+            ?hcri("connected - now send first request", [{socket, Socket}]),
+
+            case httpc_request:send(Address, Session, Request) of
+                ok ->
+                    ?hcri("first request sent", []),
+                    TmpState = State#state{request = Request,
+                                           session = Session,
+                                           mfa = init_mfa(Request, State),
+                                           status_line =
+                                           init_status_line(Request),
+                                           headers = undefined,
+                                           body = undefined,
+                                           status = new},
+                    http_transport:setopts(SocketType,
+                                           Socket, [{active, once}]),
+                    NewState = activate_request_timeout(TmpState),
+                    {ok, NewState};
+                {error, Reason} ->
+                    self() ! {init_error, error_sending,
+                              httpc_response:error(Request, Reason)},
+                    {ok, State#state{request = Request,
+                                     session =
+                                         #session{socket = Socket}}}
+            end;
+        {error, Reason} ->
+            self() ! {init_error, error_connecting,
+                      httpc_response:error(Request, Reason)},
+            {ok, State#state{request = Request}}
+    end.
+
+connect_and_send_upgrade_request(Address, Request, #state{options = Options} = State) ->
+    ConnTimeout = (Request#request.settings)#http_options.connect_timeout,
+    SocketType = ip_comm,
+    case connect(SocketType, Address, Options, ConnTimeout) of
+        {ok, Socket} ->
 	    SessionType = httpc_manager:session_type(Options),
-	    SocketType  = socket_type(Request),
-	    Session = #session{id = {Request#request.address, self()},
-			       scheme = Request#request.scheme,
-			       socket = Socket,
+	    Session = #session{socket = Socket, 
 			       socket_type = SocketType,
-			       client_close = ClientClose,
+			       id = {Request#request.address, self()},
+                               scheme = http,
+                               client_close = false,
 			       type = SessionType},
-	    ?hcri("connected - now send first request", [{socket, Socket}]),
-
-	    case httpc_request:send(Address, Session, Request) of
-		ok ->
-		    ?hcri("first request sent", []),
-		    TmpState = State#state{request = Request,
-					   session = Session,
-					   mfa = init_mfa(Request, State),
-					   status_line =
-					   init_status_line(Request),
-					   headers = undefined,
-					   body = undefined,
-					   status = new},
-		    http_transport:setopts(SocketType,
-					   Socket, [{active, once}]),
-		    NewState = activate_request_timeout(TmpState),
-		    {ok, NewState};
-		{error, Reason} ->
-		    self() ! {init_error, error_sending,
-			      httpc_response:error(Request, Reason)},
-		    {ok, State#state{request = Request,
-				     session =
-					 #session{socket = Socket}}}
-	    end;
+	    ErrorHandler = 
+		fun(ERequest, EState, EReason) ->
+			self() ! {init_error, error_sending,
+				  httpc_response:error(ERequest, EReason)},
+			{ok, EState#state{request = ERequest}} end,
+	    tls_tunnel(Address, Request, State#state{session = Session}, ErrorHandler);
 	{error, Reason} ->
 	    self() ! {init_error, error_connecting,
 		      httpc_response:error(Request, Reason)},
@@ -1024,15 +1051,25 @@ handle_http_msg(Body, #state{status_line = {_,Code, _}} = State) ->
     {NewBody, NewRequest} = stream(Body, State#state.request, Code),
     handle_response(State#state{body = NewBody, request = NewRequest}).
 
-handle_http_body(<<>>, State = #state{status_line = {_,304, _}}) ->
+handle_http_body(_, #state{status = {ssl_tunnel, _},
+			   status_line = {_,200, _}} = State) ->
+    tls_upgrade(State);  
+
+handle_http_body(_, #state{status = {ssl_tunnel, Request},
+			   status_line = StatusLine} = State) ->
+    ClientErrMsg = httpc_response:error(Request,{could_no_establish_ssh_tunnel, StatusLine}),
+    NewState     = answer_request(Request, ClientErrMsg, State),
+    {stop, normal, NewState};
+
+handle_http_body(<<>>, #state{status_line = {_,304, _}} = State) ->
     ?hcrt("handle_http_body - 304", []),
     handle_response(State#state{body = <<>>});
 
-handle_http_body(<<>>, State = #state{status_line = {_,204, _}}) ->
+handle_http_body(<<>>, #state{status_line = {_,204, _}} = State) ->
     ?hcrt("handle_http_body - 204", []),
     handle_response(State#state{body = <<>>});
 
-handle_http_body(<<>>, State = #state{request = #request{method = head}}) ->
+handle_http_body(<<>>, #state{request = #request{method = head}} = State) ->
     ?hcrt("handle_http_body - head", []),
     handle_response(State#state{body = <<>>});
 
@@ -1119,7 +1156,7 @@ handle_response(#state{request      = Request,
 			      {session,     Session}, 
 			      {status_line, StatusLine}]),
 
-    handle_cookies(Headers, Request, Options, ProfileName),
+    handle_cookies(Headers, Request, Options, httpc_manager), %% FOO profile_name
     case httpc_response:result({StatusLine, Headers, Body}, Request) of
 	%% 100-continue
 	continue -> 
@@ -1503,6 +1540,12 @@ retry_pipeline([Request | PipeLine],
 	end,
     retry_pipeline(PipeLine, NewState).
 
+handle_proxy_options(https, #options{https_proxy = {HttpsProxy, _} = HttpsProxyOpt}) when 
+      HttpsProxy =/= undefined ->
+    HttpsProxyOpt;
+handle_proxy_options(_, #options{proxy = Proxy}) ->
+    Proxy.
+
 %%% Check to see if the given {Host,Port} tuple is in the NoProxyList
 %%% Returns an eventually updated {Host,Port} tuple, with the proxy address
 handle_proxy(HostPort = {Host, _Port}, {Proxy, NoProxy}) ->
@@ -1696,6 +1739,96 @@ send_raw(SocketType, Socket, ProcessBody, Acc) ->
             end
     end.
 
+tls_tunnel(Address, Request, #state{session = #session{socket = Socket, 
+						       socket_type = SocketType} = Session} = State, 
+	   ErrorHandler) ->
+    UpgradeRequest = tls_tunnel_request(Request), 
+    case httpc_request:send(Address, Session, UpgradeRequest) of
+	ok -> 
+	    TmpState = State#state{request = UpgradeRequest,
+				   %%  session = Session,
+				   mfa = init_mfa(UpgradeRequest, State),
+				   status_line =
+				       init_status_line(UpgradeRequest),
+				   headers = undefined,
+				   body = undefined},
+	    http_transport:setopts(SocketType,
+				   Socket, [{active, once}]),
+	    NewState = activate_request_timeout(TmpState),
+	    {ok, NewState#state{status = {ssl_tunnel, Request}}};
+	{error, Reason} ->
+	   ErrorHandler(Request, State, Reason)
+    end.
+
+tls_tunnel_request(#request{headers = Headers, 
+			     settings = Options,
+			     address =  {Host, Port}= Adress,
+			     ipv6_host_with_brackets = IPV6}) ->
+    
+    URI = Host ++":" ++ integer_to_list(Port),
+    
+    #request{
+       id =  make_ref(),
+       from = self(),
+       scheme = http, %% Use tcp-first and then upgrade!
+       address = Adress,
+       path = URI,
+       pquery  = "",
+       method = connect,
+       headers = #http_request_h{host = host_header(Headers, URI),
+				 te = "",
+				 pragma = "no-cache",
+				 other = [{"Proxy-Connection", " Keep-Alive"}]},
+       settings = Options,
+       abs_uri = URI,
+       stream = false,
+       userinfo = "",
+       headers_as_is = [],
+       started  = http_util:timestamp(),
+       ipv6_host_with_brackets = IPV6       
+      }.
+
+host_header(#http_request_h{host = Host}, _) ->
+    Host;
+
+%% Handles header_as_is
+host_header(_, URI) ->
+    {ok, {_, _, Host, _, _, _}} =  http_uri:parse(URI),
+    Host.
+
+tls_upgrade(#state{status = 
+		       {ssl_tunnel, 
+			#request{settings = 
+				     #http_options{ssl = {_, TLSOptions} = SocketType}} = 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{
+			scheme = https,
+			socket = TLSSocket, 
+			socket_type = SocketType,
+			type = SessionType,
+			client_close = ClientClose},
+	    httpc_request:send(Address, Session, Request), 
+	    http_transport:setopts(SocketType, TLSSocket, [{active, once}]),
+	    NewState = State#state{session = Session,
+				   request = Request,
+				   mfa = init_mfa(Request, State),
+				   status_line =
+				       init_status_line(Request),
+				   headers = undefined,
+				   body = undefined,
+				   status = new
+				  },
+	    {noreply, activate_request_timeout(NewState)};
+	{error, _Reason} ->
+	    {stop, normal, State#state{request = Request}}
+    end.
 
 %% ---------------------------------------------------------------------
 %% Session wrappers
diff --git a/lib/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl
index 8af752546c..30e2742e9d 100644
--- a/lib/inets/src/http_client/httpc_internal.hrl
+++ b/lib/inets/src/http_client/httpc_internal.hrl
@@ -37,6 +37,7 @@
 -define(HTTP_MAX_REDIRECTS,      4).
 -define(HTTP_KEEP_ALIVE_TIMEOUT, 120000).
 -define(HTTP_KEEP_ALIVE_LENGTH,  5).
+-define(TLS_UPGRADE_TOKEN, "TLS/1.0").
 
 %%% HTTP Client per request settings
 -record(http_options,
@@ -72,6 +73,7 @@
 -record(options, 
 	{
 	 proxy = {undefined, []}, % {{ProxyHost, ProxyPort}, [NoProxy]},
+	 https_proxy = {undefined, []}, % {{ProxyHost, ProxyPort}, [NoProxy]}
 	 %% 0 means persistent connections are used without pipelining
 	 pipeline_timeout      = ?HTTP_PIPELINE_TIMEOUT, 
 	 max_pipeline_length   = ?HTTP_PIPELINE_LENGTH,
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index 3612b331e7..c45dcab802 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -577,6 +577,7 @@ handle_cast({set_options, Options}, State = #state{options = OldOptions}) ->
     ?hcrv("set options", [{options, Options}, {old_options, OldOptions}]),
     NewOptions = 
 	#options{proxy                 = get_proxy(Options, OldOptions),
+		 https_proxy           = get_https_proxy(Options, OldOptions),
 		 pipeline_timeout      = get_pipeline_timeout(Options, OldOptions), 
 		 max_pipeline_length   = get_max_pipeline_length(Options, OldOptions), 
 		 max_keep_alive_length = get_max_keep_alive_length(Options, OldOptions), 
@@ -741,7 +742,7 @@ get_manager_info(#state{handler_db = HDB,
     SessionInfo = which_sessions2(SDB), 
     OptionsInfo = 
 	[{Item, get_option(Item, Options)} || 
-	    Item <- record_info(fields, options)], 
+		  Item <- record_info(fields, options)], 
     CookieInfo  = httpc_cookie:which_cookies(CDB),
     [{handlers, HandlerInfo}, 
      {sessions, SessionInfo}, 
@@ -769,20 +770,7 @@ get_handler_info(Tab) ->
     Pattern   = {'$2', '$1', '_'},
     Handlers1 = [{Pid, Id} || [Pid, Id] <- ets:match(Tab, Pattern)],
     Handlers2 = sort_handlers(Handlers1), 
-    Handlers3 = [{Pid, Reqs, 
-		  try
-		      begin
-			  httpc_handler:info(Pid)
-		      end
-		  catch
-		      _:_ ->
-			  %% Why would this crash? 
-			  %% Only if the process has died, but we don't 
-			  %% know about it?
-			  []
-		  end} || {Pid, Reqs} <- Handlers2],
-    Handlers3.
-
+    [{Pid, Reqs, httpc_handler:info(Pid)} || {Pid, Reqs} <- Handlers2].
 
 handle_request(#request{settings = 
 			#http_options{version = "HTTP/0.9"}} = Request,
@@ -1001,6 +989,8 @@ cast(ProfileName, Msg) ->
 
 get_option(proxy, #options{proxy = Proxy}) ->
     Proxy;
+get_option(https_proxy, #options{https_proxy = Proxy}) ->
+    Proxy;
 get_option(pipeline_timeout, #options{pipeline_timeout = Timeout}) ->
     Timeout;
 get_option(max_pipeline_length, #options{max_pipeline_length = Length}) ->
@@ -1027,6 +1017,9 @@ get_option(socket_opts, #options{socket_opts = SocketOpts}) ->
 get_proxy(Opts, #options{proxy = Default}) ->
     proplists:get_value(proxy, Opts, Default).
 
+get_https_proxy(Opts, #options{https_proxy = Default}) ->
+    proplists:get_value(https_proxy, Opts, Default).
+
 get_pipeline_timeout(Opts, #options{pipeline_timeout = Default}) ->
     proplists:get_value(pipeline_timeout, Opts, Default).