Commit 020ffea637440e4283e1be11a96ded2674fdf8a0 - nginx

high level HTTP buffered flags should be on per-subrequest basis, this fix a bug in SSI when a big static file is included Igor Sysoev 15 years ago

5 changed file(s) with 28 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all

-3

src/core/ngx_connection.h less more

91	91	} ngx_connection_tcp_nopush_e;
92	92
93	93
94		#define NGX_LOWLEVEL_BUFFERED 0x0000000f
95		#define NGX_SSL_BUFFERED 0x00000001
	94	#define NGX_LOWLEVEL_BUFFERED 0x0f
	95	#define NGX_SSL_BUFFERED 0x01
96	96
97	97
98	98	struct ngx_connection_s {

132	132
133	133	ngx_atomic_uint_t number;
134	134
135		ngx_uint_t buffered;
	135	unsigned buffered:8;
136	136
137	137	unsigned log_error:2; /* ngx_connection_log_error_e */
138	138

-0

src/http/modules/ngx_http_ssi_filter_module.c less more

972	972	}
973	973	}
974	974
	975	if (ctx->in \|\| ctx->buf) {
	976	r->buffered \|= NGX_HTTP_SSI_BUFFERED;
	977
	978	} else {
	979	r->buffered &= ~NGX_HTTP_SSI_BUFFERED;
	980	}
	981
975	982	return rc;
976	983	}
977	984

+10

-2

src/http/ngx_http_copy_filter_module.c less more

108	108
109	109	rc = ngx_output_chain(ctx, in);
110	110
	111	if (!c->destroyed) {
	112
	113	if (ctx->in == NULL) {
	114	r->buffered &= ~NGX_HTTP_COPY_BUFFERED;
	115	} else {
	116	r->buffered \|= NGX_HTTP_COPY_BUFFERED;
	117	}
	118
111	119	#if (NGX_DEBUG)
112		if (!c->destroyed) {
113	120	ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
114	121	"copy filter: %i \"%V?%V\"", rc, &r->uri, &r->args);
	122	#endif
	123
115	124	}
116		#endif
117	125
118	126	return rc;
119	127	}

-1

src/http/ngx_http_request.c less more

-5

src/http/ngx_http_request.h less more

110	110	#define NGX_HTTP_INSUFFICIENT_STORAGE 507
111	111
112	112
113		#define NGX_HTTP_LOWLEVEL_BUFFERED 0x000000f0
114		#define NGX_HTTP_WRITE_BUFFERED 0x00000010
115		#define NGX_HTTP_GZIP_BUFFERED 0x00000020
116		#define NGX_HTTP_SSI_BUFFERED 0x00000100
117		#define NGX_HTTP_COPY_BUFFERED 0x00000200
	113	#define NGX_HTTP_LOWLEVEL_BUFFERED 0xf0
	114	#define NGX_HTTP_WRITE_BUFFERED 0x10
	115	#define NGX_HTTP_GZIP_BUFFERED 0x20
	116	#define NGX_HTTP_SSI_BUFFERED 0x01
	117	#define NGX_HTTP_COPY_BUFFERED 0x02
118	118
119	119
120	120	typedef enum {

450	450	unsigned header_sent:1;
451	451	unsigned done:1;
452	452	unsigned utf8:1;
	453
	454	unsigned buffered:4;
453	455
454	456	unsigned main_filter_need_in_memory:1;
455	457	unsigned filter_need_in_memory:1;