diff options
author | Charles Blake <cblake@csail.mit.edu> | 2015-02-16 14:55:08 -0500 |
---|---|---|
committer | Charles Blake <cblake@csail.mit.edu> | 2015-02-16 14:55:08 -0500 |
commit | 55840d950562e7db48f9df71e62d443e50f4e881 (patch) | |
tree | d4a7bc344896f430d9e677edca61243daeaae5fa /lib/pure/net.nim | |
parent | 629decd1701742daf115c4a550a219af17b488c1 (diff) | |
parent | 553b9308b7b4e050dca01f6fb4b032a405248310 (diff) | |
download | Nim-55840d950562e7db48f9df71e62d443e50f4e881.tar.gz |
Merge ../Nim into devel
Diffstat (limited to 'lib/pure/net.nim')
-rw-r--r-- | lib/pure/net.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pure/net.nim b/lib/pure/net.nim index 2b81b6fb0..2bd4a76d4 100644 --- a/lib/pure/net.nim +++ b/lib/pure/net.nim @@ -258,7 +258,7 @@ proc socketError*(socket: Socket, err: int = -1, async = false, of SSL_ERROR_WANT_X509_LOOKUP: raiseSSLError("Function for x509 lookup has been called.") of SSL_ERROR_SYSCALL: - var errStr = "IO error has occured " + var errStr = "IO error has occurred " let sslErr = ErrPeekLastError() if sslErr == 0 and err == 0: errStr.add "because an EOF was observed that violates the protocol" @@ -887,7 +887,7 @@ proc connectAsync(socket: Socket, name: string, port = Port(0), af: Domain = AF_INET) {.tags: [ReadIOEffect].} = ## A variant of ``connect`` for non-blocking sockets. ## - ## This procedure will immediatelly return, it will not block until a connection + ## This procedure will immediately return, it will not block until a connection ## is made. It is up to the caller to make sure the connection has been established ## by checking (using ``select``) whether the socket is writeable. ## |