Better error handling.

Author: ioquatix

lib/protocol/http2/connection.rb

@@ -343,7 +343,7 @@ def receive_data(frame)
 				if stream = @streams[frame.stream_id]
 					stream.receive_data(frame)
 				else
-					raise ProtocolError, "Cannot receive data for idle stream #{frame.stream_id}"
+					raise ProtocolError, "Cannot receive data for stream id #{frame.stream_id}"
 				end
 			end
 

lib/protocol/http2/frame.rb

@@ -161,7 +161,7 @@ def self.parse_header(buffer)
 			end
 
 			def read_header(stream)
-				if buffer = stream.read(9)
+				if buffer = stream.read(9) and buffer.bytesize == 9
 					@length, @type, @flags, @stream_id = Frame.parse_header(buffer)
 					# puts "read_header: #{@length} #{@type} #{@flags} #{@stream_id}"
 				else
@@ -170,7 +170,11 @@ def read_header(stream)
 			end
 
 			def read_payload(stream)
-				@payload = stream.read(@length)
+				if payload = stream.read(@length) and payload.bytesize == @length
+					@payload = payload
+				else
+					raise EOFError, "Could not read frame payload!"
+				end
 			end
 
 			def read(stream, maximum_frame_size = MAXIMUM_ALLOWED_FRAME_SIZE)

spec/protocol/http2/stream_spec.rb

@@ -125,7 +125,7 @@
 
 			expect do
 				server.read_frame
-			end.to raise_error(Protocol::HTTP2::ProtocolError, /Cannot receive data for idle stream/)
+			end.to raise_error(Protocol::HTTP2::ProtocolError, /Cannot receive data/)
 		end
 
 		it "cannot receive stream reset" do