aboutsummaryrefslogtreecommitdiff
path: root/src/http/modules/ngx_http_memcached_module.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2013-07-25 14:58:11 +0400
committerMaxim Dounin <mdounin@mdounin.ru>2013-07-25 14:58:11 +0400
commit416b922bd2c285551d195c1f33a3736775ea45e9 (patch)
tree6191493eaf8295560ff25ad424e776139b6c9d26 /src/http/modules/ngx_http_memcached_module.c
parent187f3948ed4de1e8886fd50cbe937816c25dede6 (diff)
downloadnginx-416b922bd2c285551d195c1f33a3736775ea45e9.tar.gz
nginx-416b922bd2c285551d195c1f33a3736775ea45e9.zip
Upstream: u->length now defaults to -1 (API change).
That is, by default we assume that response end is signalled by a connection close. This seems to be better default, and in line with u->pipe->length behaviour. Memcached module was modified accordingly.
Diffstat (limited to 'src/http/modules/ngx_http_memcached_module.c')
-rw-r--r--src/http/modules/ngx_http_memcached_module.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
index c36ad0ffb..bfff1bfc2 100644
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -441,8 +441,11 @@ ngx_http_memcached_filter_init(void *data)
u = ctx->request->upstream;
if (u->headers_in.status_n != 404) {
- u->length += NGX_HTTP_MEMCACHED_END;
+ u->length = u->headers_in.content_length_n + NGX_HTTP_MEMCACHED_END;
ctx->rest = NGX_HTTP_MEMCACHED_END;
+
+ } else {
+ u->length = 0;
}
return NGX_OK;