Merge branch 'upstream-openssl'

This commit is contained in:
Jeff Becker 2016-08-06 20:27:57 -04:00
commit 03927b0a68
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
23 changed files with 85 additions and 76 deletions

View file

@ -570,6 +570,8 @@ namespace transport
}
if (sendDatabaseStore)
session->SendI2NPMessages ({ CreateDatabaseStoreMsg () });
else
session->SetTerminationTimeout (10); // most likely it's publishing, no follow-up messages expected, set timeout to 10 seconds
it->second.sessions.push_back (session);
session->SendI2NPMessages (it->second.delayedMessages);
it->second.delayedMessages.clear ();