IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

high level HTTP buffered flags should be on per-subrequest basis,

Browse Source 
this fix a bug in SSI when a big static file is included
This commit is contained in:
Igor Sysoev 2006-10-30 20:25:22 +00:00
parent d0427afb8b
commit 020ffea637
5 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ngx_connection.h
View File

@ -92,8 +92,8 @@ typedef enum {
} 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 @@ struct ngx_connection_s {
ngx_atomic_uint_t number;
ngx_uint_t buffered;
unsigned buffered:8;
unsigned log_error:2; /* ngx_connection_log_error_e */

7
src/http/modules/ngx_http_ssi_filter_module.c
View File

@ -973,6 +973,13 @@ ngx_http_ssi_output(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx)
}
}
if (ctx->in || ctx->buf) {
r->buffered |= NGX_HTTP_SSI_BUFFERED;
} else {
r->buffered &= ~NGX_HTTP_SSI_BUFFERED;
}
return rc;
}

12
src/http/ngx_http_copy_filter_module.c
View File

@ -109,13 +109,21 @@ ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
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;
}

2
src/http/ngx_http_request.c
View File

@ -1736,7 +1736,7 @@ ngx_http_writer(ngx_http_request_t *r)
ngx_http_close_request(r, 0);
}
if (r == r->main) {
if (r == r->main || r->buffered) {
return;
}

12
src/http/ngx_http_request.h
View File

@ -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 @@ struct ngx_http_request_s {
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;