r2015 merge:

avoid recursive loop

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index ab827a648e25e3d2122cdc3a8593ce4172ca5a71..b778146619e405b209e35e3c564819a77d34decd 100644 (file)
--- 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);
     }
 }