Merge of r4612: proper subrequest handling in various modules.
This commit is contained in:
parent
87b4323b47
commit
65107cfd1c
|
@ -235,7 +235,7 @@ ngx_http_flv_handler(ngx_http_request_t *r)
|
|||
b->file_last = of.size;
|
||||
|
||||
b->in_file = b->file_last ? 1: 0;
|
||||
b->last_buf = 1;
|
||||
b->last_buf = (r == r->main) ? 1 : 0;
|
||||
b->last_in_chain = 1;
|
||||
|
||||
b->file->fd = of.fd;
|
||||
|
|
|
@ -245,7 +245,7 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
|
|||
b->file_last = of.size;
|
||||
|
||||
b->in_file = b->file_last ? 1 : 0;
|
||||
b->last_buf = 1;
|
||||
b->last_buf = (r == r->main) ? 1 : 0;
|
||||
b->last_in_chain = 1;
|
||||
|
||||
b->file->fd = of.fd;
|
||||
|
|
|
@ -616,7 +616,7 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
|
|||
b->file_last = of.size;
|
||||
|
||||
b->in_file = b->file_last ? 1 : 0;
|
||||
b->last_buf = 1;
|
||||
b->last_buf = (r == r->main) ? 1 : 0;
|
||||
b->last_in_chain = 1;
|
||||
|
||||
b->file->fd = of.fd;
|
||||
|
|
|
@ -121,7 +121,7 @@ static ngx_int_t ngx_http_status_handler(ngx_http_request_t *r)
|
|||
r->headers_out.status = NGX_HTTP_OK;
|
||||
r->headers_out.content_length_n = b->last - b->pos;
|
||||
|
||||
b->last_buf = 1;
|
||||
b->last_buf = (r == r->main) ? 1 : 0;
|
||||
|
||||
rc = ngx_http_send_header(r);
|
||||
|
||||
|
|
Loading…
Reference in New Issue