MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 23:40:57 +01:00
Code Issues Releases Wiki Activity

ircd::server: Checkpoint discard based on ssl pending; move branch.

Browse source
This commit is contained in:
Jason Volk 2018-03-26 02:24:29 -07:00
parent 04b4a379bb
commit 05ded4f0e4
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ircd/server.cc
View file

@ -1567,19 +1567,22 @@ ircd::server::link::read(const mutable_buffer &buf)
void void
ircd::server::link::discard_read() ircd::server::link::discard_read()
{ {
const size_t discard ssize_t discard
{ {
available(*socket) SSL_pending(socket->ssl.native_handle())
}; };
if(discard <= 0)
discard = available(*socket);
const size_t discarded const size_t discarded
{ {
discard_any(*socket, discard) discard_any(*socket, size_t(discard))
}; };
// Shouldn't ever be hit because the read() within discard() throws // Shouldn't ever be hit because the read() within discard() throws
// the pending error like an eof. // the pending error like an eof.
log.warning("Link to %s discarded %zu of %zu unexpected bytes", log.warning("Link to %s discarded %zu of %zd unexpected bytes",
likely(peer)? string(peer->remote) : string(remote_ipport(*socket)), likely(peer)? string(peer->remote) : string(remote_ipport(*socket)),
discarded, discarded,
discard); discard);
@ -2469,12 +2472,12 @@ const
if(state.status == (http::code)0) if(state.status == (http::code)0)
return make_read_head_buffer(); return make_read_head_buffer();
if(state.chunk_length == size_t(-1))
return make_read_chunk_head_buffer();
if(state.content_read >= size(request->in.content)) if(state.content_read >= size(request->in.content))
return make_read_discard_buffer(); return make_read_discard_buffer();
if(state.chunk_length == size_t(-1))
return make_read_chunk_head_buffer();
if(state.chunk_length) if(state.chunk_length)
return make_read_chunk_content_buffer(); return make_read_chunk_content_buffer();