Fix flag handling when sending headers with priority.

Author: ioquatix

lib/protocol/http2/headers_frame.rb

@@ -68,6 +68,9 @@ def pack(priority, data, *arguments, **options)
 
 				if priority
 					buffer << priority.pack
+					set_flags(PRIORITY)
+				else
+					clear_flags(PRIORITY)
 				end
 
 				buffer << data

lib/protocol/http2/stream.rb

@@ -163,27 +163,27 @@ def send_headers?
 			end
 
 			# The HEADERS frame is used to open a stream, and additionally carries a header block fragment. HEADERS frames can be sent on a stream in the "idle", "reserved (local)", "open", or "half-closed (remote)" state.
-			def send_headers(*args)
+			def send_headers(*arguments)
 				if @state == :idle
-					frame = write_headers(*args)
+					frame = write_headers(*arguments)
 
 					if frame.end_stream?
 						@state = :half_closed_local
 					else
 						open!
 					end
 				elsif @state == :reserved_local
-					frame = write_headers(*args)
+					frame = write_headers(*arguments)
 
 					@state = :half_closed_remote
 				elsif @state == :open
-					frame = write_headers(*args)
+					frame = write_headers(*arguments)
 
 					if frame.end_stream?
 						@state = :half_closed_local
 					end
 				elsif @state == :half_closed_remote
-					frame = write_headers(*args)
+					frame = write_headers(*arguments)
 
 					if frame.end_stream?
 						close!

spec/protocol/http2/dependency_spec.rb

@@ -121,4 +121,32 @@
 
 		server.consume_window
 	end
+	
+	it "correctly allocates window" do
+		streams = 4.times.collect{client.create_stream}
+		
+		top = streams.first
+		
+		top.send_headers(nil, [])
+		top.send_reset_stream
+		
+		2.times {server.read_frame}
+		
+		# The dependency has been recycled:
+		expect(server.dependencies).to_not include(top.id)
+		
+		bottom = streams.last
+		
+		priority = bottom.priority
+		priority.stream_dependency = top.id
+		
+		bottom.send_headers(priority, [])
+		
+		1.times {server.read_frame}
+		
+		expect(server.dependencies).to include(bottom.id)
+		
+		dependency = server.dependencies[bottom.id]
+		expect(dependency.parent).to be == server.dependency
+	end
 end