Mercurial > hg > nginx

changeset 2104:744ae0917c7a stable-0.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r2067 merge: fix bug when inactive subrequest is truncated, if output_buffers are less than subrequest size
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jul 2008 11:32:02 +0000
parents 297e8aeca6b3
children c5e8484b22ab
files src/http/ngx_http_postpone_filter_module.c
diffstat 1 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_postpone_filter_module.c
+++ b/src/http/ngx_http_postpone_filter_module.c
@@ -168,7 +168,7 @@ ngx_http_postpone_filter_output_postpone
         pr = r->postponed;
 
         if (pr == NULL) {
-            return NGX_OK;
+            break;
         }
 
         if (pr->request) {
@@ -196,7 +196,7 @@ ngx_http_postpone_filter_output_postpone
         }
 
         if (pr == NULL) {
-            return NGX_OK;
+            break;
         }
 
         out = pr->out;
@@ -215,6 +215,17 @@ ngx_http_postpone_filter_output_postpone
 
         r->postponed = r->postponed->next;
     }
+
+    if (r->out) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "http postpone filter out again \"%V?%V\"",
+                       &r->uri, &r->args);
+
+        r->connection->data = r;
+        return NGX_AGAIN;
+    }
+
+    return NGX_OK;
 }