summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-07-07 11:50:21 +0000
committerIgor Sysoev <igor@sysoev.ru>2008-07-07 11:50:21 +0000
commit6898462e80ec19e8738005a0ae45599d19530a89 (patch)
tree9d9bd9a97083a5bafdef40d35a245aa290808de4
parent51d70b398a17847367e4ebb49eae8f74c05c27d5 (diff)
downloadnginx-6898462e80ec19e8738005a0ae45599d19530a89.tar.gz
r2015 merge:
avoid recursive loop
-rw-r--r--src/http/ngx_http_request.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index ab827a648..b77814661 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2046,7 +2046,8 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
hc->pipeline = 1;
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;
}
@@ -2156,7 +2157,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
c->idle = 1;
if (rev->ready) {
- ngx_http_keepalive_handler(rev);
+ ngx_post_event(rev, &ngx_posted_events);
}
}