提交 22623e0c 编写于 作者: M Matt Caswell

Teach more BIOs how to handle BIO_CTRL_EOF

Reviewed-by: NTomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: NDmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/10882)
上级 db943f43
...@@ -527,7 +527,12 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr) ...@@ -527,7 +527,12 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
break; break;
case BIO_CTRL_DUP: case BIO_CTRL_DUP:
break; break;
case BIO_CTRL_EOF:
if (b->next_bio == NULL)
ret = 0;
else
ret = BIO_ctrl(b->next_bio, cmd, num, ptr);
break;
default: default:
ret = 0; ret = 0;
break; break;
......
...@@ -316,6 +316,8 @@ static int conn_read(BIO *b, char *out, int outl) ...@@ -316,6 +316,8 @@ static int conn_read(BIO *b, char *out, int outl)
if (ret <= 0) { if (ret <= 0) {
if (BIO_sock_should_retry(ret)) if (BIO_sock_should_retry(ret))
BIO_set_retry_read(b); BIO_set_retry_read(b);
else if (ret == 0)
b->flags |= BIO_FLAGS_IN_EOF;
} }
} }
return ret; return ret;
...@@ -495,6 +497,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) ...@@ -495,6 +497,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
*fptr = data->info_callback; *fptr = data->info_callback;
} }
break; break;
case BIO_CTRL_EOF:
ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0;
break;
default: default:
ret = 0; ret = 0;
break; break;
......
...@@ -123,6 +123,8 @@ static int fd_read(BIO *b, char *out, int outl) ...@@ -123,6 +123,8 @@ static int fd_read(BIO *b, char *out, int outl)
if (ret <= 0) { if (ret <= 0) {
if (BIO_fd_should_retry(ret)) if (BIO_fd_should_retry(ret))
BIO_set_retry_read(b); BIO_set_retry_read(b);
else if (ret == 0)
b->flags |= BIO_FLAGS_IN_EOF;
} }
} }
return ret; return ret;
...@@ -186,6 +188,9 @@ static long fd_ctrl(BIO *b, int cmd, long num, void *ptr) ...@@ -186,6 +188,9 @@ static long fd_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_CTRL_FLUSH: case BIO_CTRL_FLUSH:
ret = 1; ret = 1;
break; break;
case BIO_CTRL_EOF:
ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0;
break;
default: default:
ret = 0; ret = 0;
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册