From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 21 Oct 2013 16:47:54 +0000 (+0200)
Subject: ssh: initialize per-handle data in ssh_connect()
X-Git-Tag: curl-7_34_0~212
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f70b2c77f4889316acb75d41e97a7f28c9a6a995;p=thirdparty%2Fcurl.git

ssh: initialize per-handle data in ssh_connect()

... if not already initialized.  This fixes a regression introduced by
commit 4ad8e142da463ab208d5b5565e53291c8e5ef038, which caused test619
to intermittently fail on certain machines (namely Fedora build hosts).
---

diff --git a/lib/ssh.c b/lib/ssh.c
index 79f58bbf3c..35cb20193c 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2725,6 +2725,10 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done)
   CURLcode result;
   struct SessionHandle *data = conn->data;
 
+  /* initialize per-handle data if not already */
+  if(!data->req.protop)
+    ssh_setup_connection(conn);
+
   /* We default to persistent connections. We set this already in this connect
      function to make the re-use checks properly be able to check this bit. */
   conn->bits.close = FALSE;