Skip to content

Commit 01a1b20

Browse files
committed
rbx doesn't have Addrinfo
1 parent 9c5b494 commit 01a1b20

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

lib/webmachine/request.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
require 'forwardable'
33
require 'webmachine/constants'
44
require 'ipaddr'
5-
require 'socket'
65

76
module Webmachine
87
# Request represents a single HTTP request sent from a client. It
@@ -185,7 +184,7 @@ def parse_addr(string)
185184
end
186185

187186
# Pass address, port to Addrinfo.tcp. It will raise SocketError if address or port is not valid.
188-
Addrinfo.tcp(address, port)
187+
[IPAddr.new(address).to_s, port.to_i]
189188
end
190189

191190
def build_uri(uri, headers)
@@ -194,11 +193,11 @@ def build_uri(uri, headers)
194193
return uri
195194
end
196195

197-
addr = parse_addr(headers.fetch(HOST))
196+
addr, port = parse_addr(headers.fetch(HOST))
198197

199198
uri.scheme = HTTP
200-
uri.host = addr.ip_address
201-
uri.port = addr.ip_port == 0 ? 80 : addr.ip_port
199+
uri.host = addr
200+
uri.port = port == 0 ? 80 : port
202201

203202
uri
204203
end

0 commit comments

Comments
 (0)