high level HTTP buffered flags should be on per-subrequest basis,
this fix a bug in SSI when a big static file is included
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 2c694fa..1694dd4 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -92,8 +92,8 @@
} ngx_connection_tcp_nopush_e;
-#define NGX_LOWLEVEL_BUFFERED 0x0000000f
-#define NGX_SSL_BUFFERED 0x00000001
+#define NGX_LOWLEVEL_BUFFERED 0x0f
+#define NGX_SSL_BUFFERED 0x01
struct ngx_connection_s {
@@ -133,7 +133,7 @@
ngx_atomic_uint_t number;
- ngx_uint_t buffered;
+ unsigned buffered:8;
unsigned log_error:2; /* ngx_connection_log_error_e */
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c
index dc02498..1ee34db 100644
--- a/src/http/modules/ngx_http_ssi_filter_module.c
+++ b/src/http/modules/ngx_http_ssi_filter_module.c
@@ -973,6 +973,13 @@
}
}
+ if (ctx->in || ctx->buf) {
+ r->buffered |= NGX_HTTP_SSI_BUFFERED;
+
+ } else {
+ r->buffered &= ~NGX_HTTP_SSI_BUFFERED;
+ }
+
return rc;
}
diff --git a/src/http/ngx_http_copy_filter_module.c b/src/http/ngx_http_copy_filter_module.c
index 311c195..c96dbfa 100644
--- a/src/http/ngx_http_copy_filter_module.c
+++ b/src/http/ngx_http_copy_filter_module.c
@@ -109,13 +109,21 @@
rc = ngx_output_chain(ctx, in);
-#if (NGX_DEBUG)
if (!c->destroyed) {
+
+ if (ctx->in == NULL) {
+ r->buffered &= ~NGX_HTTP_COPY_BUFFERED;
+ } else {
+ r->buffered |= NGX_HTTP_COPY_BUFFERED;
+ }
+
+#if (NGX_DEBUG)
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"copy filter: %i \"%V?%V\"", rc, &r->uri, &r->args);
- }
#endif
+ }
+
return rc;
}
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index a7bbcdd..951db75 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1736,7 +1736,7 @@
ngx_http_close_request(r, 0);
}
- if (r == r->main) {
+ if (r == r->main || r->buffered) {
return;
}
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 1e98b2d..57ffe4c 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -111,11 +111,11 @@
#define NGX_HTTP_INSUFFICIENT_STORAGE 507
-#define NGX_HTTP_LOWLEVEL_BUFFERED 0x000000f0
-#define NGX_HTTP_WRITE_BUFFERED 0x00000010
-#define NGX_HTTP_GZIP_BUFFERED 0x00000020
-#define NGX_HTTP_SSI_BUFFERED 0x00000100
-#define NGX_HTTP_COPY_BUFFERED 0x00000200
+#define NGX_HTTP_LOWLEVEL_BUFFERED 0xf0
+#define NGX_HTTP_WRITE_BUFFERED 0x10
+#define NGX_HTTP_GZIP_BUFFERED 0x20
+#define NGX_HTTP_SSI_BUFFERED 0x01
+#define NGX_HTTP_COPY_BUFFERED 0x02
typedef enum {
@@ -452,6 +452,8 @@
unsigned done:1;
unsigned utf8:1;
+ unsigned buffered:4;
+
unsigned main_filter_need_in_memory:1;
unsigned filter_need_in_memory:1;
unsigned filter_need_temporary:1;
