Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expand hints for getAddrInfo. More exception safety. #91

Merged
merged 1 commit into from
Dec 11, 2014
Merged

Expand hints for getAddrInfo. More exception safety. #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 12 additions & 9 deletions http-client-openssl/Network/HTTP/Client/OpenSSL.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ opensslManagerSettings mkContext = defaultManagerSettings
return $ \_ha host port -> do
-- Copied/modified from openssl-streams
let hints = N.defaultHints
{ N.addrFlags = [N.AI_ADDRCONFIG, N.AI_NUMERICSERV]
{ N.addrFlags = [N.AI_ADDRCONFIG, N.AI_NUMERICSERV]
, N.addrFamily = N.AF_INET
, N.addrSocketType = N.Stream
}
(addrInfo:_) <- N.getAddrInfo (Just hints) (Just host) (Just $ show port)

Expand All @@ -37,12 +39,13 @@ opensslManagerSettings mkContext = defaultManagerSettings
let protocol = N.addrProtocol addrInfo
let address = N.addrAddress addrInfo

sock <- N.socket family socketType protocol
N.connect sock address
ssl <- SSL.connection ctx sock
SSL.connect ssl
makeConnection
(SSL.read ssl 32752)
(SSL.write ssl)
(N.sClose sock)
bracketOnError (N.socket family socketType protocol) (N.close)
$ \sock -> do
N.connect sock address
ssl <- SSL.connection ctx sock
SSL.connect ssl
makeConnection
(SSL.read ssl 32752)
(SSL.write ssl)
(N.close sock)
}