merged fix from RC_0_16

This commit is contained in:
Arvid Norberg
2013-08-02 01:25:52 +00:00
parent 990275d2dc
commit c0a0769aea
2 changed files with 16 additions and 3 deletions

View File

@@ -100,9 +100,16 @@ void test_ssl(int test_idx)
session ses2(fingerprint("LT", 0, 1, 0, 0), std::make_pair(49075, 50000), "0.0.0.0", 0, alert_mask);
session_settings sett;
// this disables outgoing SSL connections
sett.ssl_listen = 0;
if (!test.downloader_has_cert) ses2.set_settings(sett);
sett.ssl_listen = 1024 + rand() % 50000;
ses1.set_settings(sett);
if (!test.downloader_has_cert)
// this disables outgoing SSL connections
sett.ssl_listen = 0;
else
sett.ssl_listen += 10;
ses2.set_settings(sett);
torrent_handle tor1;
torrent_handle tor2;