diff options
| author | Loïc Hoguin <[email protected]> | 2015-03-25 13:46:20 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-03-25 13:46:20 +0100 |
| commit | 13add09e80b931165f720a2b8b4d90fc890e0d6c (patch) | |
| tree | a25320dc088c956581c9106c3d23f071600e9c11 | |
| parent | 83d8b63b8abb46b374439c8c8571091968af6260 (diff) | |
| download | gun-13add09e80b931165f720a2b8b4d90fc890e0d6c.tar.gz gun-13add09e80b931165f720a2b8b4d90fc890e0d6c.tar.bz2 gun-13add09e80b931165f720a2b8b4d90fc890e0d6c.zip | |
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.
| -rw-r--r-- | src/gun.erl | 5 | ||||
| -rw-r--r-- | src/gun_spdy.erl | 4 |
2 files changed, 4 insertions, 5 deletions
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 -> |