-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Move Crystal stdlib classes overrides to a separate file * Document known crystal overrides * Update crystal overrides for HTTP::Client socket * Update shard.yml to restrict crystal versions * Fix compilation error in Crystal 1.1.x (See crystal-lang/crystal#10965 for more details about this issue).
- Loading branch information
1 parent
e9add69
commit 4b46313
Showing
3 changed files
with
71 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
# Override of the TCPSocket and HTTP::Client classes in oder to allow an | ||
# IP family to be selected for domains that resolve to both IPv4 and | ||
# IPv6 addresses. | ||
# | ||
class TCPSocket | ||
def initialize(host : String, port, dns_timeout = nil, connect_timeout = nil, family = Socket::Family::UNSPEC) | ||
Addrinfo.tcp(host, port, timeout: dns_timeout, family: family) do |addrinfo| | ||
super(addrinfo.family, addrinfo.type, addrinfo.protocol) | ||
connect(addrinfo, timeout: connect_timeout) do |error| | ||
close | ||
error | ||
end | ||
end | ||
end | ||
end | ||
|
||
# :ditto: | ||
class HTTP::Client | ||
property family : Socket::Family = Socket::Family::UNSPEC | ||
|
||
private def io | ||
io = @io | ||
return io if io | ||
unless @reconnect | ||
raise "This HTTP::Client cannot be reconnected" | ||
end | ||
|
||
hostname = @host.starts_with?('[') && @host.ends_with?(']') ? @host[1..-2] : @host | ||
io = TCPSocket.new hostname, @port, @dns_timeout, @connect_timeout, @family | ||
io.read_timeout = @read_timeout if @read_timeout | ||
io.write_timeout = @write_timeout if @write_timeout | ||
io.sync = false | ||
|
||
{% if !flag?(:without_openssl) %} | ||
if tls = @tls | ||
tcp_socket = io | ||
begin | ||
io = OpenSSL::SSL::Socket::Client.new(tcp_socket, context: tls, sync_close: true, hostname: @host) | ||
rescue exc | ||
# don't leak the TCP socket when the SSL connection failed | ||
tcp_socket.close | ||
raise exc | ||
end | ||
end | ||
{% end %} | ||
|
||
@io = io | ||
end | ||
end | ||
|
||
# Mute the ClientError exception raised when a connection is flushed. | ||
# This happends when the connection is unexpectedly closed by the client. | ||
# | ||
class HTTP::Server::Response | ||
class Output | ||
private def unbuffered_flush | ||
@io.flush | ||
rescue ex : IO::Error | ||
unbuffered_close | ||
end | ||
end | ||
end | ||
|
||
# TODO: Document this override | ||
# | ||
class PG::ResultSet | ||
def field(index = @column_index) | ||
@fields.not_nil![index] | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters