summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-07-07 11:23:28 +0000
committerIgor Sysoev <igor@sysoev.ru>2008-07-07 11:23:28 +0000
commitd0f352907238eae1b850a9cdfde763d5fc95e306 (patch)
tree943d1f5c6d38a49696f06e39750d7fc93022f693
parentb3f6cdf9cccfc0190bba22cf138434d07b8ec108 (diff)
downloadnginx-d0f352907238eae1b850a9cdfde763d5fc95e306.tar.gz
nginx-d0f352907238eae1b850a9cdfde763d5fc95e306.tar.bz2
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 0535fc0ef..5258ad91f 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2157,7 +2157,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;
}
@@ -2273,7 +2274,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);
}
}