From 4a40e68a824399fe18422f2b1d027fb730285911 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sat, 14 Jan 2012 16:04:25 +0000 Subject: [PATCH] landed ssl branch back into trunk --- ChangeLog | 1 + Jamfile | 4 +- docs/dht_extensions.html | 24 +- docs/extension_protocol.html | 24 +- docs/libtorrent_plugins.html | 24 +- docs/make_torrent.html | 18 +- docs/make_torrent.rst | 15 + docs/manual.html | 464 +++++++++++------------ docs/manual.rst | 57 ++- docs/running_tests.html | 24 +- examples/client_test.cpp | 21 +- include/libtorrent/aux_/session_impl.hpp | 26 +- include/libtorrent/error_code.hpp | 4 +- include/libtorrent/session_settings.hpp | 4 + include/libtorrent/ssl_stream.hpp | 8 +- include/libtorrent/torrent.hpp | 18 - src/error_code.cpp | 4 +- src/peer_connection.cpp | 38 +- src/session_impl.cpp | 263 +++++++++++-- src/torrent.cpp | 261 ++++--------- 20 files changed, 737 insertions(+), 565 deletions(-) diff --git a/ChangeLog b/ChangeLog index d885ebd69..f8833c787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ + * improve SSL torrent support by using SNI and a single SSL listen socket * improved peer exchange performance by sharing incoming connections which advertize listen port * deprecate set_ratio(), and per-peer rate limits * add web seed support for torrents with pad files diff --git a/Jamfile b/Jamfile index 9f33d4ef3..5df2d2d5c 100755 --- a/Jamfile +++ b/Jamfile @@ -65,7 +65,7 @@ rule linking ( properties * ) } # gcrypt libraries, if enabled - if gcrypt in $(properties) + if gcrypt in $(properties) || openssl in $(properties) { # on mac os x, adding the /opt/local/include path # would include openssl headers incompatible with @@ -371,7 +371,7 @@ lib boost_system : : boost_system ; lib gcrypt : : gcrypt shared /opt/local/lib ; lib z : : shared z /lib ; lib crypto : : crypto /lib z ; -lib ssl : : ssl shared crypto ; +lib ssl : : ssl shared crypto /opt/local/lib ; lib dl : : shared dl ; # time functions used on linux require librt diff --git a/docs/dht_extensions.html b/docs/dht_extensions.html index 1684e8e0f..83efc7203 100644 --- a/docs/dht_extensions.html +++ b/docs/dht_extensions.html @@ -2,25 +2,23 @@ - +