aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-08-26 18:55:41 +0200
committerLoïc Hoguin <[email protected]>2013-08-26 18:56:54 +0200
commit5388696cf95d6c9b4400952bfcf3fb9db215c63c (patch)
treeeb5c52c44e250e1b2699167e11d297f598e310d5 /src
parent0c5a2c3a9097207da803da7ee45cdad2d387a5a4 (diff)
downloadgun-5388696cf95d6c9b4400952bfcf3fb9db215c63c.tar.gz
gun-5388696cf95d6c9b4400952bfcf3fb9db215c63c.tar.bz2
gun-5388696cf95d6c9b4400952bfcf3fb9db215c63c.zip
Fix server pushed streams
Diffstat (limited to 'src')
-rw-r--r--src/gun_spdy.erl27
1 files changed, 20 insertions, 7 deletions
diff --git a/src/gun_spdy.erl b/src/gun_spdy.erl
index 410ed57..98c538f 100644
--- a/src/gun_spdy.erl
+++ b/src/gun_spdy.erl
@@ -80,20 +80,33 @@ handle_frame(Rest, State=#spdy_state{owner=Owner,
end;
handle_frame(Rest, State=#spdy_state{owner=Owner,
socket=Socket, transport=Transport},
- {syn_stream, StreamID, _, IsFin, IsUnidirectional,
- _, Method, _, Host, Path, Version, Headers}) ->
+ {syn_stream, StreamID, AssocToStreamID, IsFin, IsUnidirectional,
+ _, Method, _, Host, Path, Version, Headers})
+ when AssocToStreamID =/= 0, IsUnidirectional ->
case get_stream_by_id(StreamID, State) of
false ->
- StreamRef = make_ref(),
- Owner ! {gun, request, self(), StreamRef,
- Method, Host, Path, Headers},
- handle_loop(Rest, new_stream(StreamID, StreamRef,
- not IsFin, not IsUnidirectional, Version, State));
+ case get_stream_by_id(AssocToStreamID, State) of
+ #stream{ref=AssocToStreamRef} ->
+ StreamRef = make_ref(),
+ Owner ! {gun_push, self(), StreamRef,
+ AssocToStreamRef, Method, Host, Path, Headers},
+ handle_loop(Rest, new_stream(StreamID, StreamRef,
+ not IsFin, false, Version, State));
+ false ->
+ Transport:send(Socket,
+ cow_spdy:rst_stream(AssocToStreamID, invalid_stream)),
+ handle_loop(Rest, State)
+ end;
#stream{} ->
Transport:send(Socket,
cow_spdy:rst_stream(StreamID, stream_in_use)),
handle_loop(Rest, State)
end;
+handle_frame(Rest, State=#spdy_state{socket=Socket, transport=Transport},
+ {syn_stream, StreamID, _, _, _, _, _, _, _, _, _, _}) ->
+ Transport:send(Socket,
+ cow_spdy:rst_stream(StreamID, protocol_error)),
+ handle_loop(Rest, State);
handle_frame(Rest, State=#spdy_state{owner=Owner,
socket=Socket, transport=Transport},
{syn_reply, StreamID, IsFin, Status, _, Headers}) ->