Skip to content

Commit 5fc22dd

Browse files
committed
There is no real reason why this has to be the default.
1 parent ea4b387 commit 5fc22dd

File tree

5 files changed

+3
-37
lines changed

5 files changed

+3
-37
lines changed

lib/protocol/http2/client.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@ def send_connection_preface(settings = [])
2828
if @state == :new
2929
@framer.write_connection_preface
3030

31-
# We don't support RFC7540 priorities:
32-
if settings.is_a?(Hash)
33-
settings = settings.dup
34-
else
35-
settings = settings.to_h
36-
end
37-
38-
unless settings.key?(Settings::NO_RFC7540_PRIORITIES)
39-
settings = settings.dup
40-
settings[Settings::NO_RFC7540_PRIORITIES] = 1
41-
end
42-
4331
send_settings(settings)
4432

4533
yield if block_given?

lib/protocol/http2/framer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module HTTP2
2222
FRAMES = [
2323
DataFrame,
2424
HeadersFrame,
25-
nil, # PriorityFrame is deprecated / removed.
25+
nil, # PriorityFrame is deprecated and ignored, instead consider using PriorityUpdateFrame instead.
2626
ResetStreamFrame,
2727
SettingsFrame,
2828
PushPromiseFrame,

lib/protocol/http2/server.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@ def read_connection_preface(settings = [])
2828
if @state == :new
2929
@framer.read_connection_preface
3030

31-
# We don't support RFC7540 priorities:
32-
if settings.is_a?(Hash)
33-
settings = settings.dup
34-
else
35-
settings = settings.to_h
36-
end
37-
38-
unless settings.key?(Settings::NO_RFC7540_PRIORITIES)
39-
settings = settings.dup
40-
settings[Settings::NO_RFC7540_PRIORITIES] = 1
41-
end
42-
4331
send_settings(settings)
4432

4533
read_frame do |frame|

test/protocol/http2/client.rb

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
client_settings_frame = framer.read_frame
3636
expect(client_settings_frame).to be_a Protocol::HTTP2::SettingsFrame
37-
expect(client_settings_frame.unpack).to be == settings + [[Protocol::HTTP2::Settings::NO_RFC7540_PRIORITIES, 1]]
37+
expect(client_settings_frame.unpack).to be == settings
3838

3939
# Fake (empty) server settings:
4040
server_settings_frame = Protocol::HTTP2::SettingsFrame.new
@@ -63,16 +63,6 @@
6363
end.to raise_exception(Protocol::HTTP2::ProtocolError, message: be =~ /First frame must be Protocol::HTTP2::SettingsFrame/)
6464
end
6565

66-
it "should send connection preface with no RFC7540 priorities" do
67-
server_settings_frame = client.send_connection_preface({}) do
68-
client_settings_frame = server.read_connection_preface({})
69-
70-
expect(client_settings_frame.unpack).to be == [[Protocol::HTTP2::Settings::NO_RFC7540_PRIORITIES, 1]]
71-
end
72-
73-
expect(server_settings_frame.unpack).to be == [[Protocol::HTTP2::Settings::NO_RFC7540_PRIORITIES, 1]]
74-
end
75-
7666
it "can generate a stream id" do
7767
id = client.next_stream_id
7868
expect(id).to be == 1

test/protocol/http2/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
# The server immediately sends its own settings frame...
7979
frame = framer.read_frame
8080
expect(frame).to be_a Protocol::HTTP2::SettingsFrame
81-
expect(frame.unpack).to be == server_settings + [[Protocol::HTTP2::Settings::NO_RFC7540_PRIORITIES, 1]]
81+
expect(frame.unpack).to be == server_settings
8282

8383
# And then it acknowledges the client settings:
8484
frame = framer.read_frame

0 commit comments

Comments
 (0)