mirror of
https://github.com/nginx/nginx.git
synced 2024-12-04 05:38:59 +08:00
r2015 merge:
avoid recursive loop
This commit is contained in:
parent
b3f6cdf9cc
commit
d0f3529072
@ -2157,7 +2157,8 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
|
|||||||
hc->pipeline = 1;
|
hc->pipeline = 1;
|
||||||
c->log->action = "reading client pipelined request line";
|
c->log->action = "reading client pipelined request line";
|
||||||
|
|
||||||
ngx_http_init_request(rev);
|
rev->handler = ngx_http_init_request;
|
||||||
|
ngx_post_event(rev, &ngx_posted_events);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2273,7 +2274,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
|
|||||||
c->idle = 1;
|
c->idle = 1;
|
||||||
|
|
||||||
if (rev->ready) {
|
if (rev->ready) {
|
||||||
ngx_http_keepalive_handler(rev);
|
ngx_post_event(rev, &ngx_posted_events);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user