Skip to content

Rollback LAZY_BUF_ALLOC remove in HttpTunnel #7583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 1 commit into from
Apr 7, 2021
Merged

Rollback LAZY_BUF_ALLOC remove in HttpTunnel #7583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions proxy/http/HttpTunnel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@ HttpTunnel::consumer_reenable(HttpTunnelConsumer *c)
{
HttpTunnelProducer *p = c->producer;

if (p && p->alive && p->read_buffer->write_avail() > 0) {
if (p && p->alive) {
// Only do flow control if enabled and the producer is an external
// source. Otherwise disable by making the backlog zero. Because
// the backlog short cuts quit when the value is equal (or
Expand Down Expand Up @@ -1370,7 +1370,7 @@ HttpTunnel::consumer_handler(int event, HttpTunnelConsumer *c)
// the SM since the reenabling has the side effect
// updating the buffer state for the VConnection
// that is being reenabled
if (p->alive && p->read_vio && p->read_buffer->write_avail() > 0) {
if (p->alive && p->read_vio) {
if (p->is_throttled()) {
this->consumer_reenable(c);
} else {
Expand Down