Commit 5c6365af authored by Hendrik Leppkes's avatar Hendrik Leppkes

avformat/tls_schannel: fix handling of EOF after avio changes

parent 638575cd
...@@ -413,11 +413,13 @@ static int tls_read(URLContext *h, uint8_t *buf, int len) ...@@ -413,11 +413,13 @@ static int tls_read(URLContext *h, uint8_t *buf, int len)
ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset, ret = ffurl_read(s->tcp, c->enc_buf + c->enc_buf_offset,
c->enc_buf_size - c->enc_buf_offset); c->enc_buf_size - c->enc_buf_offset);
if (ret < 0) { if (ret == AVERROR_EOF) {
c->connection_closed = 1;
ret = 0;
} else if (ret < 0) {
av_log(h, AV_LOG_ERROR, "Unable to read from socket\n"); av_log(h, AV_LOG_ERROR, "Unable to read from socket\n");
return ret; return ret;
} else if (ret == 0) }
c->connection_closed = 1;
c->enc_buf_offset += ret; c->enc_buf_offset += ret;
} }
...@@ -515,7 +517,7 @@ cleanup: ...@@ -515,7 +517,7 @@ cleanup:
if (ret == 0 && !c->connection_closed) if (ret == 0 && !c->connection_closed)
ret = AVERROR(EAGAIN); ret = AVERROR(EAGAIN);
return ret < 0 ? ret : 0; return ret < 0 ? ret : AVERROR_EOF;
} }
static int tls_write(URLContext *h, const uint8_t *buf, int len) static int tls_write(URLContext *h, const uint8_t *buf, int len)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment