nginx-0.0.1-2003-10-17-20:53:26 import

diff --git a/src/event/ngx_event_proxy.c b/src/event/ngx_event_proxy.c
index c6bd8a373f114652d3bab0eda2e3424abc383e87..a683be3c9e4a9cb83c8703e15120c2caa8c52c80 100644 (file)
--- a/src/event/ngx_event_proxy.c
+++ b/src/event/ngx_event_proxy.c
@@ -246,7 +246,9 @@ int ngx_event_proxy_write_to_downstream(ngx_event_proxy_t *p)
         } else if (!p->cachable && p->in) {
             out = p->in;
 
-            if (p->busy_len + ngx_hunk_size(out->hunk) > p->max_busy_len) {
+            if (!(p->upstream_eof || p->upstream_error || p->upstream_done)
+                && (p->busy_len + ngx_hunk_size(out->hunk) > p->max_busy_len))
+            {
                 break;
             }
 

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 71b1c21cf7763b28d61d5b33bb100be59568be80..f972402b7e6af1bc60bb160a7005a8a73cbcb9a7 100644 (file)
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -721,7 +721,10 @@ static ssize_t ngx_http_read_request_header(ngx_http_request_t *r)
     n = r->header_in->last - r->header_in->pos;
 
     if (n > 0) {
+#if 0
+        /* TODO: THINK - AIO ??? */
         rev->ready = 0;
+#endif
         return n;
     }