diff options
| author | Chris Araman <chris.araman@fuze.com> | 2015-04-29 16:08:43 -0700 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2015-05-02 18:54:13 +0200 |
| commit | aa99a63f03af6e126dc401d7ab3d1890be7e4e22 (patch) | |
| tree | 87f7a0bd6cd07dc569d1a25a3da28fff34392a4e | |
| parent | 4bb8bad964f7ce84866f67054f8fae431ed45136 (diff) | |
schannel: fix regression in schannel_recv
https://github.com/bagder/curl/issues/244
Commit 145c263 changed the behavior when Curl_read_plain returns
CURLE_AGAIN. We now handle CURLE_AGAIN and SEC_I_CONTEXT_EXPIRED
correctly.
| -rw-r--r-- | lib/vtls/schannel.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 3cd21d208..92b6da3d3 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -823,7 +823,7 @@ schannel_recv(struct connectdata *conn, int sockindex, char *buf, size_t len, CURLcode *err) { size_t size = 0; - ssize_t nread = 0, ret = -1; + ssize_t nread = 0, ret = 0; CURLcode result; struct SessionHandle *data = conn->data; struct ssl_connect_data *connssl = &conn->ssl[sockindex]; @@ -884,14 +884,13 @@ schannel_recv(struct connectdata *conn, int sockindex, size, &nread); /* check for received data */ if(*err != CURLE_OK) - ret = -1; + return -1; else { if(nread > 0) /* increase encrypted data buffer offset */ connssl->encdata_offset += nread; - ret = nread; } - infof(data, "schannel: encrypted data got %zd\n", ret); + infof(data, "schannel: encrypted data got %zd\n", nread); } infof(data, "schannel: encrypted data buffer: offset %zu length %zu\n", @@ -1033,8 +1032,6 @@ schannel_recv(struct connectdata *conn, int sockindex, infof(data, "schannel: decrypted data buffer: offset %zu length %zu\n", connssl->decdata_offset, connssl->decdata_length); } - else - ret = 0; /* check if the server closed the connection */ if(ret <= 0 && ( /* special check for Windows 2000 Professional */ |