merged ssl fix from RC_0_16

This commit is contained in:
Arvid Norberg
2013-07-28 15:06:28 +00:00
parent 2599acf451
commit beae6cece0
21 changed files with 565 additions and 58 deletions

View File

@@ -73,7 +73,8 @@ extern EXPORT boost::detail::atomic_count g_http_tracker_requests;
void EXPORT create_random_files(std::string const& path, const int file_sizes[], int num_files);
boost::intrusive_ptr<libtorrent::torrent_info> EXPORT create_torrent(std::ostream* file = 0
, int piece_size = 16 * 1024, int num_pieces = 13, bool add_tracker = true, bool encrypted = false);
, int piece_size = 16 * 1024, int num_pieces = 13, bool add_tracker = true
, std::string ssl_certificate = "");
boost::tuple<libtorrent::torrent_handle
, libtorrent::torrent_handle
@@ -82,7 +83,7 @@ EXPORT setup_transfer(libtorrent::session* ses1, libtorrent::session* ses2
, libtorrent::session* ses3, bool clear_files, bool use_metadata_transfer = true
, bool connect = true, std::string suffix = "", int piece_size = 16 * 1024
, boost::intrusive_ptr<libtorrent::torrent_info>* torrent = 0, bool super_seeding = false
, libtorrent::add_torrent_params const* p = 0, bool stop_lsd = true, bool encrypted_torrent = false);
, libtorrent::add_torrent_params const* p = 0, bool stop_lsd = true, bool use_ssl_ports = false);
int EXPORT start_web_server(bool ssl = false, bool chunked = false);
void EXPORT stop_web_server();