Mercurial > hg > nginx-ranges

diff src/http/ngx_http_request_body.c @ 256:2e9c57a5e50a NGINX_0_4_13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.4.13 *) Feature: the "proxy_pass" directive may be used inside the "limit_except" block. *) Feature: the "limit_except" directive supports all WebDAV methods. *) Bugfix: if the "add_before_body" directive was used without the "add_after_body" directive, then an response did not transferred complete. *) Bugfix: a large request body did not receive if the epoll method and the deferred accept() were used. *) Bugfix: a charset could not be set for ngx_http_autoindex_module responses; bug appeared in 0.3.50. *) Bugfix: the "[alert] zero size buf" error when FastCGI server was used; *) Bugfix: the --group= configuration parameter was ignored. Thanks to Thomas Moschny. *) Bugfix: the 50th subrequest in SSI response did not work; bug appeared in 0.3.50.
author Igor Sysoev <http://sysoev.ru>
date Wed, 15 Nov 2006 00:00:00 +0300
parents a528ae0fe909
children c5c2b2883984
line wrap: on
line diff
--- a/src/http/ngx_http_request_body.c
+++ b/src/http/ngx_http_request_body.c
@@ -265,66 +265,72 @@ ngx_http_do_read_client_request_body(ngx
                    "http read client request body");
 
     for ( ;; ) {
-        if (rb->buf->last == rb->buf->end) {
+        for ( ;; ) {
+            if (rb->buf->last == rb->buf->end) {
+
+                if (ngx_http_write_request_body(r, rb->to_write) != NGX_OK) {
+                    return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                }
 
-            if (ngx_http_write_request_body(r, rb->to_write) != NGX_OK) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+                rb->to_write = rb->bufs->next ? rb->bufs->next : rb->bufs;
+                rb->buf->last = rb->buf->start;
+            }
+
+            size = rb->buf->end - rb->buf->last;
+
+            if ((off_t) size > rb->rest) {
+                size = (size_t) rb->rest;
             }
 
-            rb->to_write = rb->bufs->next ? rb->bufs->next : rb->bufs;
-            rb->buf->last = rb->buf->start;
-        }
+            n = c->recv(c, rb->buf->last, size);
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                           "http client request body recv %z", n);
 
-        size = rb->buf->end - rb->buf->last;
+            if (n == NGX_AGAIN) {
+                break;
+            }
+
+            if (n == 0) {
+                ngx_log_error(NGX_LOG_INFO, c->log, 0,
+                              "client closed prematurely connection");
+            }
 
-        if ((off_t) size > rb->rest) {
-            size = (size_t) rb->rest;
+            if (n == 0 || n == NGX_ERROR) {
+                c->error = 1;
+                return NGX_HTTP_BAD_REQUEST;
+            }
+
+            rb->buf->last += n;
+            rb->rest -= n;
+            r->request_length += n;
+
+            if (rb->rest == 0) {
+                break;
+            }
+
+            if (rb->buf->last < rb->buf->end) {
+                break;
+            }
         }
 
-        n = c->recv(c, rb->buf->last, size);
-
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                       "http client request body recv %z", n);
-
-        if (n == NGX_AGAIN) {
-            break;
-        }
-
-        if (n == 0) {
-            ngx_log_error(NGX_LOG_INFO, c->log, 0,
-                          "client closed prematurely connection");
-        }
-
-        if (n == 0 || n == NGX_ERROR) {
-            c->error = 1;
-            return NGX_HTTP_BAD_REQUEST;
-        }
-
-        rb->buf->last += n;
-        rb->rest -= n;
-        r->request_length += n;
+                       "http client request body rest %uz", rb->rest);
 
         if (rb->rest == 0) {
             break;
         }
 
-        if (rb->buf->last < rb->buf->end) {
-            break;
-        }
-    }
-
-    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
-                   "http client request body rest %uz", rb->rest);
+        if (!c->read->ready) {
+            clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
+            ngx_add_timer(c->read, clcf->client_body_timeout);
 
-    if (rb->rest) {
-        clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
-        ngx_add_timer(c->read, clcf->client_body_timeout);
+            if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
+                return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            }
 
-        if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
-            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+            return NGX_AGAIN;
         }
-
-        return NGX_AGAIN;
     }
 
     if (c->read->timer_set) {