From: Igor Sysoev Date: Mon, 7 Jul 2008 11:23:28 +0000 (+0000) Subject: r2015 merge: X-Git-Tag: release-0.6.32~7 X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=d0f352907238eae1b850a9cdfde763d5fc95e306;p=nginx.git r2015 merge: avoid recursive loop --- 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); } }