Skip to content

Commit

Permalink
Merge pull request rust-lang#130 from kolloch/patch-1
Browse files Browse the repository at this point in the history
Fix links to tokio-tls documentation
  • Loading branch information
alexcrichton authored Sep 7, 2016
2 parents 6de5151 + e6e9be4 commit 187dde8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions TUTORIAL.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,16 +189,16 @@ represents the client half of a TLS connection. Next we call the
argument is the domain name we're connecting to, with the I/O object
as the second.

[`ClientContext::new`]: http://alexcrichton.com/futures-rs/futures_tls/struct.ClientContext.html#method.new
[`handshake`]: http://alexcrichton.com/futures-rs/futures_tls/struct.ClientContext.html#method.handshake
[`ClientContext::new`]: https://tokio-rs.github.io/tokio-tls/tokio_tls/struct.ClientContext.html#method.new
[`handshake`]: https://tokio-rs.github.io/tokio-tls/tokio_tls/struct.ClientContext.html#method.handshake

Like with [`tcp_connect`] from before, the [`handshake`] method
returns a future. The actual TLS handshake may take some time as the
client and server need to perform some I/O, agree on certificates,
etc. Once resolved, however, the future will become a [`TlsStream`],
similar to our previous [`TcpStream`]

[`TlsStream`]: http://alexcrichton.com/futures-rs/futures_tls/struct.TlsStream.html
[`TlsStream`]: https://tokio-rs.github.io/tokio-tls/tokio_tls/struct.TlsStream.html

The [`and_then`] combinator is doing some heavy lifting behind the
scenes here by ensuring that it executes futures in the right order
Expand Down

0 comments on commit 187dde8

Please sign in to comment.