diff options
author | Daniel Stenberg <daniel@haxx.se> | 2011-05-01 23:01:31 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2011-05-01 23:02:39 +0200 |
commit | 7d94af497d27543337e18012518e2a27a46c35a1 (patch) | |
tree | a30d816e7561a186c740f9de88b2e413aafdcb55 /lib/ssh.h | |
parent | a490961b10c62bf1f0c251d5a507c2eab4c5db70 (diff) | |
download | curl-7d94af497d27543337e18012518e2a27a46c35a1.tar.gz |
SSH: set non-blocking earlier
Introduce an INIT state for the SSH state machine and set libssh2
non-blocking in that so that it is set properly before
libssh2_session_startup() is called.
Bug: http://curl.haxx.se/mail/archive-2011-05/0001.html
Diffstat (limited to 'lib/ssh.h')
-rw-r--r-- | lib/ssh.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -36,7 +36,8 @@ typedef enum { SSH_NO_STATE = -1, /* Used for "nextState" so say there is none */ SSH_STOP = 0, /* do nothing state, stops the state machine */ - SSH_S_STARTUP, /* Session startup, First state in SSH-CONNECT */ + SSH_INIT, /* First state in SSH-CONNECT */ + SSH_S_STARTUP, /* Session startup */ SSH_HOSTKEY, /* verify hostkey */ SSH_AUTHLIST, SSH_AUTH_PKEY_INIT, |