Skip to content

Commit

Permalink
Rename HTTP::Server#bind_ssl to HTTP::Server#bind_tls
Browse files Browse the repository at this point in the history
  • Loading branch information
straight-shoota committed Aug 13, 2018
1 parent e66f80d commit a0e4bd3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions spec/std/http/server/server_spec.cr
Expand Up @@ -394,7 +394,7 @@ module HTTP
end
end

describe "#bind_ssl" do
describe "#bind_tls" do
it "binds SSL server context" do
server = Server.new do |context|
context.response.puts "Test Server (#{context.request.headers["Host"]?})"
Expand All @@ -405,7 +405,7 @@ module HTTP

socket = OpenSSL::SSL::Server.new(TCPServer.new("127.0.0.1", 0), server_context)
server.bind socket
ip_address1 = server.bind_ssl "127.0.0.1", 0, server_context
ip_address1 = server.bind_tls "127.0.0.1", 0, server_context
ip_address2 = socket.local_address

spawn server.listen
Expand Down
16 changes: 8 additions & 8 deletions src/http/server.cr
Expand Up @@ -218,9 +218,9 @@ class HTTP::Server
# context = OpenSSL::SSL::Context::Server.new
# context.certificate_chain = "openssl.crt"
# context.private_key = "openssl.key"
# server.bind_ssl "127.0.0.1", 8080, context
# server.bind_tls "127.0.0.1", 8080, context
# ```
def bind_ssl(host : String, port : Int32, context : OpenSSL::SSL::Context::Server, reuse_port : Bool = false) : Socket::IPAddress
def bind_tls(host : String, port : Int32, context : OpenSSL::SSL::Context::Server, reuse_port : Bool = false) : Socket::IPAddress
tcp_server = TCPServer.new(host, port, reuse_port)
server = OpenSSL::SSL::Server.new(tcp_server, context)

Expand All @@ -238,10 +238,10 @@ class HTTP::Server
# context = OpenSSL::SSL::Context::Server.new
# context.certificate_chain = "openssl.crt"
# context.private_key = "openssl.key"
# address = server.bind_ssl "127.0.0.1", context
# address = server.bind_tls "127.0.0.1", context
# ```
def bind_ssl(host : String, context : OpenSSL::SSL::Context::Server) : Socket::IPAddress
bind_ssl(host, 0, context)
def bind_tls(host : String, context : OpenSSL::SSL::Context::Server) : Socket::IPAddress
bind_tls(host, 0, context)
end

# Creates an `OpenSSL::SSL::Server` and adds it as a socket.
Expand All @@ -253,10 +253,10 @@ class HTTP::Server
# context = OpenSSL::SSL::Context::Server.new
# context.certificate_chain = "openssl.crt"
# context.private_key = "openssl.key"
# address = server.bind_ssl Socket::IPAddress.new("127.0.0.1", 8000), context
# address = server.bind_tls Socket::IPAddress.new("127.0.0.1", 8000), context
# ```
def bind_ssl(address : Socket::IPAddress, context : OpenSSL::SSL::Context::Server) : Socket::IPAddress
bind_ssl(address.address, address.port, context)
def bind_tls(address : Socket::IPAddress, context : OpenSSL::SSL::Context::Server) : Socket::IPAddress
bind_tls(address.address, address.port, context)
end
{% end %}

Expand Down

0 comments on commit a0e4bd3

Please sign in to comment.