Skip to content
Snippets Groups Projects
Commit 336eb7ba authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch '1.7' of github.com:tarantool/tarantool into 1.7

parents 5851579c 5dd41017
No related branches found
No related tags found
No related merge requests found
......@@ -589,7 +589,10 @@ iproto_connection_on_input(ev_loop *loop, struct ev_io *watcher,
try {
/* Ensure we have sufficient space for the next round. */
struct iobuf *iobuf;
if (mempool_count(&iproto_msg_pool) > IPROTO_MSG_MAX ||
if ((mempool_count(&iproto_msg_pool) > IPROTO_MSG_MAX &&
/* Don't stop connection if there is no pending requests */
(ibuf_used(&con->iobuf[0]->in) > con->parse_size ||
ibuf_used(&con->iobuf[1]->in))) ||
(iobuf = iproto_connection_input_iobuf(con)) == NULL) {
ev_io_stop(loop, &con->input);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment