From 13add09e80b931165f720a2b8b4d90fc890e0d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 25 Mar 2015 13:46:20 +0100 Subject: Fix the order of stream references in gun_push message Should be simpler if the original stream reference is at the same position in all messages. --- src/gun.erl | 5 ++--- src/gun_spdy.erl | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gun.erl b/src/gun.erl index 3569cf5..b7ffcd3 100644 --- a/src/gun.erl +++ b/src/gun.erl @@ -247,9 +247,8 @@ await(ServerPid, StreamRef, Timeout, MRef) -> {response, IsFin, Status, Headers}; {gun_data, ServerPid, StreamRef, IsFin, Data} -> {data, IsFin, Data}; - {gun_push, ServerPid, StreamRef, AssocToStreamRef, - Method, Host, Path, Headers} -> - {push, AssocToStreamRef, Method, Host, Path, Headers}; + {gun_push, ServerPid, StreamRef, NewStreamRef, Method, Host, Path, Headers} -> + {push, NewStreamRef, Method, Host, Path, Headers}; {gun_error, ServerPid, StreamRef, Reason} -> {error, Reason}; {gun_error, ServerPid, Reason} -> diff --git a/src/gun_spdy.erl b/src/gun_spdy.erl index 4db4822..faaf05e 100644 --- a/src/gun_spdy.erl +++ b/src/gun_spdy.erl @@ -89,8 +89,8 @@ handle_frame(Rest, State=#spdy_state{owner=Owner, case get_stream_by_id(AssocToStreamID, State) of #stream{ref=AssocToStreamRef} -> StreamRef = make_ref(), - Owner ! {gun_push, self(), StreamRef, - AssocToStreamRef, Method, Host, Path, Headers}, + Owner ! {gun_push, self(), AssocToStreamRef, + StreamRef, Method, Host, Path, Headers}, handle_loop(Rest, new_stream(StreamID, StreamRef, not IsFin, false, Version, State)); false -> -- cgit v1.2.3