summaryrefslogtreecommitdiff
path: root/src/http/ngx_http_request.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-04-04 12:50:30 +0000
committerJonathan Kolb <jon@b0g.us>2011-04-04 12:50:30 +0000
commitf241ce02a4e7971bf509ea005b4791812d54c522 (patch)
tree995761817026a7147e180731e9ccd2293326bfbb /src/http/ngx_http_request.c
parentbe28c50206ac6f3f1bbbede6a495f5d0b5abad70 (diff)
downloadnginx-0.9.tar.gz
Changes with nginx 0.9.7 04 Apr 2011v0.9.7nginx-0.9
*) Feature: now keepalive connections may be closed premature, if there are no free worker connections. Thanks to Maxim Dounin. *) Feature: the "rotate" parameter of the "image_filter" directive. Thanks to Adam Bocim. *) Bugfix: a case when a backend in "fastcgi_pass", "scgi_pass", or "uwsgi_pass" directives is given by expression and refers to a defined upstream.
Diffstat (limited to 'src/http/ngx_http_request.c')
-rw-r--r--src/http/ngx_http_request.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index bd51e061f..2cef4fa5b 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2594,6 +2594,7 @@ ngx_http_set_keepalive(ngx_http_request_t *r)
#endif
c->idle = 1;
+ ngx_reusable_connection(c, 1);
if (rev->ready) {
ngx_post_event(rev, &ngx_posted_events);
@@ -2703,6 +2704,7 @@ ngx_http_keepalive_handler(ngx_event_t *rev)
c->log->action = "reading client request line";
c->idle = 0;
+ ngx_reusable_connection(c, 0);
ngx_http_init_request(rev);
}