# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1316112199 0
# Node ID dbddec65fdab46e3d97a3fa0f84b4e8ede67b2b5
# Parent  103b0d9afe079aac29b4fa966471c92d4f71af68
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 -r 103b0d9afe07 -r dbddec65fdab src/http/modules/ngx_http_memcached_module.c
--- a/src/http/modules/ngx_http_memcached_module.c	Thu Sep 15 18:33:43 2011 +0000
+++ b/src/http/modules/ngx_http_memcached_module.c	Thu Sep 15 18:43:19 2011 +0000
@@ -407,7 +407,7 @@
     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 -r 103b0d9afe07 -r dbddec65fdab src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c	Thu Sep 15 18:33:43 2011 +0000
+++ b/src/http/ngx_http_upstream.c	Thu Sep 15 18:43:19 2011 +0000
@@ -1942,12 +1942,7 @@
 
     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 @@
 
         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 @@
     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 -r 103b0d9afe07 -r dbddec65fdab src/http/ngx_http_upstream.h
--- a/src/http/ngx_http_upstream.h	Thu Sep 15 18:33:43 2011 +0000
+++ b/src/http/ngx_http_upstream.h	Thu Sep 15 18:43:19 2011 +0000
@@ -267,7 +267,7 @@
     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;