From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Jul 2008 11:50:21 +0000 (+0000)
Subject: r2015 merge:
X-Git-Tag: release-0.5.37~5
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=6898462e80ec19e8738005a0ae45599d19530a89;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 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);
     }
 }