http-protocol 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e259d3cffa653715457b5ecae02b116b4ab063bb837828370ac87d5ae5ec6c70
-  data.tar.gz: 3e4044515e54d35934d1fa90be3c518c5baee318fe7c01f8237dfb0411076f39
+  metadata.gz: 844a6b761eb8218e0b856cccefc1767cbac8db29ed703d1b8419a532b75bc7bf
+  data.tar.gz: 85dbf29d8cc3aefdbb79af289c0d8a9e91622f8bf13be6ca552cc7ec49acefb9
 SHA512:
-  metadata.gz: 8eeddbf50275851a6aa5958cf9efc0f07a004c438b0ef6eb8780819ac1ff5816736d7c0214adbec05d2e387c89f8e3e6077e93913369cac5858139e9168c52b0
-  data.tar.gz: c05014726647a9fe13f716d119e578f7793e22d496ab29670a3523d5b65cdaed8e5c67114e6614e9c04a41274c2e58cadb2752b89c5e3d73ab33c74e1684f473
+  metadata.gz: 8771480a7207e74671a33f05fe21143039b04458c11489c5f6ffa6d8f36e44c7c5193c938bb7ffdb47c024e70a3f7abce5f212225e97131f60ebb665d7127887
+  data.tar.gz: 16582bbbe013e74ce15db5e2aa61f0f6750bae5e28d43483998d0a9d0b54088ae5ae6771048ca02ff466daab42bc72af96ea7d3d400675d3a09fe6b77699c641

data/lib/http/protocol/http1/connection.rb

@@ -147,6 +147,8 @@ module HTTP
 				def read_response(method)
 					version, status, reason = read_line.split(/\s+/, 3)
 					
+					status = Integer(status)
+					
 					headers = read_headers
 					
 					@persistent = persistent?(version, headers)
@@ -155,7 +157,7 @@ module HTTP
 					
 					@count += 1
 					
-					return version, Integer(status), reason, headers, body
+					return version, status, reason, headers, body
 				end
 				
 				def read_headers
@@ -315,7 +317,7 @@ module HTTP
 					# code is always terminated by the first empty line after the
 					# header fields, regardless of the header fields present in the
 					# message, and thus cannot contain a message body.
-					if method == "HEAD" or status == 204 or status == 304
+					if method == "HEAD" or (status >= 100 and status < 200) or status == 204 or status == 304
 						return nil
 					end
 					
@@ -328,26 +330,16 @@ module HTTP
 						return read_tunnel_body
 					end
 					
-					if body = read_body(headers)
-						return body
-					else
-						# 7.  Otherwise, this is a response message without a declared message
-						# body length, so the message body length is determined by the
-						# number of octets received prior to the server closing the
-						# connection.
-						return read_remainder_body
-					end
+					return read_body(headers, true)
 				end
 				
 				def read_request_body(headers)
 					# 6.  If this is a request message and none of the above are true, then
 					# the message body length is zero (no message body is present).
-					if body = read_body(headers)
-						return body
-					end
+					return read_body(headers)
 				end
 				
-				def read_body(headers)
+				def read_body(headers, remainder = false)
 					# 3.  If a Transfer-Encoding header field is present and the chunked
 					# transfer coding (Section 4.1) is the final encoding, the message
 					# body length is determined by reading and decoding the chunked
@@ -387,12 +379,22 @@ module HTTP
 					# incomplete and close the connection.
 					if content_length = headers.delete(CONTENT_LENGTH)
 						length = Integer(content_length)
-						if length >= 0
+						if length > 0
 							return read_fixed_body(length)
+						elsif length == 0
+							return nil
 						else
 							raise BadRequest, "Invalid content length: #{content_length}"
 						end
 					end
+					
+					if remainder
+						# 7.  Otherwise, this is a response message without a declared message
+						# body length, so the message body length is determined by the
+						# number of octets received prior to the server closing the
+						# connection.
+						return read_remainder_body
+					end
 				end
 			end
 		end

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.8.0"
+		VERSION = "0.8.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Samuel Williams