From ffba6390941f40d28d15535c95076dbf0f3c4137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Fri, 6 Nov 2020 14:22:23 +0100
Subject: Make CONNECT responses produce a response_end event

While the stream has not ended, the response has.
---
 src/gun_http.erl  |  8 ++++++--
 src/gun_http2.erl | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/gun_http.erl b/src/gun_http.erl
index 0eeca05..a2c3303 100644
--- a/src/gun_http.erl
+++ b/src/gun_http.erl
@@ -324,6 +324,10 @@ handle_connect(Rest, State=#http_state{
 		status => Status,
 		headers => Headers
 	}, EvHandlerState0),
+	EvHandlerState = EvHandler:response_end(#{
+		stream_ref => RealStreamRef,
+		reply_to => ReplyTo
+	}, EvHandlerState1),
 	%% We expect there to be no additional data after the CONNECT response.
 	%% @todo That's probably wrong.
 	<<>> = Rest,
@@ -342,7 +346,7 @@ handle_connect(Rest, State=#http_state{
 			{[
 				{origin, <<"https">>, NewHost, NewPort, connect},
 				{tls_handshake, HandshakeEvent, Protocols, ReplyTo}
-			], CookieStore, EvHandlerState1};
+			], CookieStore, EvHandlerState};
 		_ ->
 			[NewProtocol0] = maps:get(protocols, Destination, [http]),
 			NewProtocol = gun_protocols:add_stream_ref(NewProtocol0, RealStreamRef),
@@ -351,7 +355,7 @@ handle_connect(Rest, State=#http_state{
 			{[
 				{origin, <<"http">>, NewHost, NewPort, connect},
 				{switch_protocol, NewProtocol, ReplyTo}
-			], CookieStore, EvHandlerState1}
+			], CookieStore, EvHandlerState}
 	end.
 
 %% @todo We probably shouldn't send info messages if the stream is not alive.
diff --git a/src/gun_http2.erl b/src/gun_http2.erl
index 8f0632b..04d4de5 100644
--- a/src/gun_http2.erl
+++ b/src/gun_http2.erl
@@ -517,7 +517,11 @@ headers_frame_connect(State=#http2_state{transport=Transport, opts=Opts, tunnel_
 		status => Status,
 		headers => Headers
 	}, EvHandlerState0),
-	EvHandlerState2 = EvHandler:origin_changed(#{
+	EvHandlerState2 = EvHandler:response_end(#{
+		stream_ref => RealStreamRef,
+		reply_to => ReplyTo
+	}, EvHandlerState1),
+	EvHandlerState3 = EvHandler:origin_changed(#{
 		stream_ref => RealStreamRef,
 		type => connect,
 		origin_scheme => case Destination of
@@ -526,7 +530,7 @@ headers_frame_connect(State=#http2_state{transport=Transport, opts=Opts, tunnel_
 		end,
 		origin_host => DestHost,
 		origin_port => DestPort
-	}, EvHandlerState1),
+	}, EvHandlerState2),
 	ContinueStreamRef = continue_stream_ref(State, StreamRef),
 	OriginSocket = #{
 		gun_pid => self(),
@@ -576,7 +580,7 @@ headers_frame_connect(State=#http2_state{transport=Transport, opts=Opts, tunnel_
 			}
 	end,
 	{tunnel, ProtoState, EvHandlerState} = Proto:init(
-		ReplyTo, OriginSocket, gun_tcp_proxy, ProtoOpts, EvHandler, EvHandlerState2),
+		ReplyTo, OriginSocket, gun_tcp_proxy, ProtoOpts, EvHandler, EvHandlerState3),
 	{store_stream(State, Stream#stream{tunnel=Tunnel#tunnel{state=established,
 		info=TunnelInfo, protocol=Proto, protocol_state=ProtoState}}),
 		EvHandlerState}.
-- 
cgit v1.2.3