# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1314890513 -14400
# Node ID 3e730e31d8eb54db2d79079b3eadbcc8bba2e914
# Parent 7383d1e59b73aff371fd7cdc2f0fd800bce0b84e
Upstream: r->upstream->length type change to off_t.

Previous use of size_t may cause wierd effects on 32bit platforms with certain
big responses transferred in unbuffered mode.

Nuke "if (size > u->length)" check as it's not usefull anyway (preread
body data isn't subject to this check) and now requires additional check
for u->length being positive.

diff --git a/src/http/modules/ngx_http_memcached_module.c b/src/http/modules/ngx_http_memcached_module.c
--- a/src/http/modules/ngx_http_memcached_module.c
+++ b/src/http/modules/ngx_http_memcached_module.c
@@ -407,7 +407,7 @@ ngx_http_memcached_filter(void *data, ss
u = ctx->request->upstream;
b = &u->buffer;

- if (u->length == ctx->rest) {
+ if (u->length == (ssize_t) ctx->rest) {

if (ngx_strncmp(b->last,
ngx_http_memcached_end + NGX_HTTP_MEMCACHED_END - ctx->rest,
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1942,12 +1942,7 @@ ngx_http_upstream_process_headers(ngx_ht

r->headers_out.content_length_n = u->headers_in.content_length_n;

- if (u->headers_in.content_length_n != -1) {
- u->length = (size_t) u->headers_in.content_length_n;
-
- } else {
- u->length = NGX_MAX_SIZE_T_VALUE;
- }
+ u->length = u->headers_in.content_length_n;

return NGX_OK;
}
@@ -2419,10 +2414,6 @@ ngx_http_upstream_process_non_buffered_r

size = b->end - b->last;

- if (size > u->length) {
- size = u->length;
- }
-
if (size && upstream->read->ready) {

n = upstream->recv(upstream, b->last, size);
@@ -2519,7 +2510,7 @@ ngx_http_upstream_non_buffered_filter(vo
cl->buf->last = b->last;
cl->buf->tag = u->output.tag;

- if (u->length == NGX_MAX_SIZE_T_VALUE) {
+ if (u->length == -1) {
return NGX_OK;
}

diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -267,7 +267,7 @@ struct ngx_http_upstream_s {
ngx_http_upstream_resolved_t *resolved;

ngx_buf_t buffer;
- size_t length;
+ off_t length;

ngx_chain_t *out_bufs;
ngx_chain_t *busy_bufs;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel