Skip to content

C
capnproto
Commit b9874e00 authored by Kenton Varda's avatar Kenton Varda
Browse files
Options

Fix TLS EOF handling.

parent d6c01a0f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
c++/src/kj/compat/tls.c++
View file @ b9874e00
...@@ -225,7 +225,7 @@ private: ...@@ -225,7 +225,7 @@ private:
return sslCall([this,buffer,maxBytes]() { return SSL_read(ssl, buffer, maxBytes); }) return sslCall([this,buffer,maxBytes]() { return SSL_read(ssl, buffer, maxBytes); })
.then([this,buffer,minBytes,maxBytes,alreadyDone](size_t n) -> kj::Promise<size_t> { .then([this,buffer,minBytes,maxBytes,alreadyDone](size_t n) -> kj::Promise<size_t> {
if (n >= minBytes) { if (n >= minBytes || n == 0) {
return alreadyDone + n; return alreadyDone + n;
} else { } else {
return tryReadInternal(reinterpret_cast<byte*>(buffer) + n, return tryReadInternal(reinterpret_cast<byte*>(buffer) + n,
...@@ -240,7 +240,9 @@ private: ...@@ -240,7 +240,9 @@ private:
return sslCall([this,first]() { return SSL_write(ssl, first.begin(), first.size()); }) return sslCall([this,first]() { return SSL_write(ssl, first.begin(), first.size()); })
.then([this,first,rest](size_t n) -> kj::Promise<void> { .then([this,first,rest](size_t n) -> kj::Promise<void> {
if (n < first.size()) { if (n == 0) {
return KJ_EXCEPTION(DISCONNECTED, "ssl connection ended during write");
} else if (n < first.size()) {
return writeInternal(first.slice(n, first.size()), rest); return writeInternal(first.slice(n, first.size()), rest);
} else if (rest.size() > 0) { } else if (rest.size() > 0) {
return writeInternal(rest[0], rest.slice(1, rest.size())); return writeInternal(rest[0], rest.slice(1, rest.size()));
......
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