fix missing initialization in SSH code

... causing test 619 to fail
This commit is contained in:
Kamil Dudka 2013-10-21 18:54:10 +02:00
parent 787e73101d
commit 0831955018
2 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,32 @@
From 06c74b11fa976246307fbcbd36f71f59f2beaa6f Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 21 Oct 2013 18:47:54 +0200
Subject: [PATCH] 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).
[upstream commit f70b2c77f4889316acb75d41e97a7f28c9a6a995]
---
lib/ssh.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/lib/ssh.c b/lib/ssh.c
index 79f58bb..e8b8b7c 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2719,6 +2719,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;
--
1.7.1

View File

@ -13,6 +13,9 @@ Patch1: 0001-curl-7.33.0-4d49ffe1.patch
# fix missing initialization in NTLM code causing test 906 to fail
Patch2: 0002-curl-7.33.0-86c64f3d.patch
# fix missing initialization in SSH code causing test 619 to fail
Patch3: 0003-curl-7.33.0-f70b2c77.patch
# patch making libcurl multilib ready
Patch101: 0101-curl-7.32.0-multilib.patch
@ -112,6 +115,7 @@ documentation of the library, too.
# upstream patches
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Fedora patches
%patch101 -p1
@ -233,6 +237,7 @@ rm -rf $RPM_BUILD_ROOT
* Mon Oct 14 2013 Kamil Dudka <kdudka@redhat.com> 7.33.0-1
- new upstream release
- fix missing initialization in NTLM code causing test 906 to fail
- fix missing initialization in SSH code causing test 619 to fail
* Fri Oct 11 2013 Kamil Dudka <kdudka@redhat.com> 7.32.0-3
- do not limit the speed of SCP upload on a fast connection