Merge branch '2.0' into develop-2.0-merge

This commit is contained in:
Markus Makela
2016-09-21 14:59:30 +03:00
6 changed files with 82 additions and 33 deletions

View File

@ -345,6 +345,8 @@ static bool connect_server(backend_ref_t *bref, SESSION *session, bool execute_h
if (bref->bref_dcb != NULL)
{
bref_clear_state(bref, BREF_CLOSED);
if (!execute_history || execute_sescmd_history(bref))
{
/** Add a callback for unresponsive server */