From 3409c782f87df8dcf966afa5192b00f1785bb9ae Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 31 May 2015 21:57:38 +0000 Subject: [PATCH] merged changes from RC_1_0 --- include/libtorrent/extensions.hpp | 6 +++--- include/libtorrent/session.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libtorrent/extensions.hpp b/include/libtorrent/extensions.hpp index 6545e228e..88998864d 100644 --- a/include/libtorrent/extensions.hpp +++ b/include/libtorrent/extensions.hpp @@ -357,7 +357,7 @@ namespace libtorrent // can add entries to the extension handshake // this is not called for web seeds virtual void add_handshake(entry&) {} - + // called when the peer is being disconnected. virtual void on_disconnect(error_code const& /*ec*/) {} @@ -369,13 +369,13 @@ namespace libtorrent // throwing an exception from any of the handlers (except add_handshake) // closes the connection - + // this is called when the initial BT handshake is received. Returning false // means that the other end doesn't support this extension and will remove // it from the list of plugins. // this is not called for web seeds virtual bool on_handshake(char const* /*reserved_bits*/) { return true; } - + // called when the extension handshake from the other end is received // if this returns false, it means that this extension isn't // supported by this peer. It will result in this peer_plugin diff --git a/include/libtorrent/session.hpp b/include/libtorrent/session.hpp index 0cdb7ca63..eb8f5c68b 100644 --- a/include/libtorrent/session.hpp +++ b/include/libtorrent/session.hpp @@ -165,13 +165,13 @@ namespace libtorrent { public: - // If the fingerprint in the first overload is omited, the client will - // get a default fingerprint stating the version of libtorrent. The + // If the fingerprint in the first overload is omited, the client will get + // a default fingerprint stating the version of libtorrent. The // fingerprint is a short string that will be used in the peer-id to // identify the client and the client's version. For more details see the // fingerprint class. // - // The flags paramater can be used to start default features (upnp & + // The flags parameter can be used to start default features (upnp & // nat-pmp) and default plugins (ut_metadata, ut_pex and smart_ban). The // default is to start those features. If you do not want them to start, // pass 0 as the flags parameter.