mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

support ranges for single memory buffer

Browse Source
This commit is contained in:
Igor Sysoev 2006-12-29 07:47:37 +00:00
parent 818700cfcf
commit 6fd25e105c
1 changed files with 61 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/http/modules/ngx_http_range_filter_module.c
View File

@ -45,6 +45,7 @@
typedef struct { typedef struct {
off_t offset;
ngx_str_t boundary_header; ngx_str_t boundary_header;
} ngx_http_range_filter_ctx_t; } ngx_http_range_filter_ctx_t;
@ -305,6 +306,15 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
return rc; return rc;
} }
ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_range_filter_ctx_t));
if (ctx == NULL) {
return NGX_ERROR;
}
ngx_http_set_ctx(r, ctx, ngx_http_range_body_filter_module);
r->headers_out.status = NGX_HTTP_PARTIAL_CONTENT; r->headers_out.status = NGX_HTTP_PARTIAL_CONTENT;
if (r->headers_out.ranges.nelts == 1) { if (r->headers_out.ranges.nelts == 1) {
@ -347,14 +357,6 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
/* TODO: what if no content_type ?? */ /* TODO: what if no content_type ?? */
ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_range_filter_ctx_t));
if (ctx == NULL) {
return NGX_ERROR;
}
ngx_http_set_ctx(r, ctx, ngx_http_range_body_filter_module);
len = sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN len = sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
+ sizeof(CRLF "Content-Type: ") - 1 + sizeof(CRLF "Content-Type: ") - 1
+ r->headers_out.content_type.len + r->headers_out.content_type.len
@ -456,59 +458,73 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
} }
/*
* TODO:
* buffer or buffers is in memory
* range or ranges are overlapped in buffers
*/
static ngx_int_t static ngx_int_t
ngx_http_range_body_filter(ngx_http_request_t *r, ngx_chain_t *in) ngx_http_range_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
{ {
ngx_uint_t i; off_t start, last;
ngx_buf_t *b, *buf; ngx_buf_t *b, *buf;
ngx_uint_t i;
ngx_chain_t *out, *hcl, *rcl, *dcl, **ll; ngx_chain_t *out, *hcl, *rcl, *dcl, **ll;
ngx_http_range_t *range; ngx_http_range_t *range;
ngx_http_range_filter_ctx_t *ctx; ngx_http_range_filter_ctx_t *ctx;
if (in == NULL if (in == NULL || r->headers_out.ranges.nelts == 0) {
|| r->headers_out.ranges.nelts == 0
|| ngx_buf_special(in->buf))
{
return ngx_http_next_body_filter(r, in); return ngx_http_next_body_filter(r, in);
} }
range = r->headers_out.ranges.elts;
buf = in->buf; buf = in->buf;
if (!buf->in_file) { if (ngx_buf_special(in->buf)) {
goto in_memory; return ngx_http_next_body_filter(r, in);
} }
ctx = ngx_http_get_module_ctx(r, ngx_http_range_body_filter_module);
if (ctx->offset) {
goto overlapped;
}
range = r->headers_out.ranges.elts;
if (!buf->last_buf) { if (!buf->last_buf) {
if (buf->in_file) {
start = buf->file_pos + ctx->offset;
last = buf->file_last + ctx->offset;
} else {
start = buf->pos - buf->start + ctx->offset;
last = buf->last - buf->start + ctx->offset;
}
for (i = 0; i < r->headers_out.ranges.nelts; i++) { for (i = 0; i < r->headers_out.ranges.nelts; i++) {
if (buf->file_pos > range[i].start if (start > range[i].start || last < range[i].end) {
|| buf->file_last < range[i].end)
{
goto overlapped; goto overlapped;
} }
} }
} }
/* /*
* the optimized version for the static files only * the optimized version for the responses
* that are passed in the single file buffer * that are passed in the single buffer
*/ */
ctx->offset = ngx_buf_size(buf);
if (r->headers_out.ranges.nelts == 1) { if (r->headers_out.ranges.nelts == 1) {
buf->file_pos = range->start; if (buf->in_file) {
buf->file_last = range->end; buf->file_pos = range->start;
buf->file_last = range->end;
}
if (ngx_buf_in_memory(buf)) {
buf->pos = buf->start + (size_t) range->start;
buf->last = buf->start + (size_t) range->end;
}
return ngx_http_next_body_filter(r, in); return ngx_http_next_body_filter(r, in);
} }
ctx = ngx_http_get_module_ctx(r, ngx_http_range_body_filter_module);
ll = &out; ll = &out;
for (i = 0; i < r->headers_out.ranges.nelts; i++) { for (i = 0; i < r->headers_out.ranges.nelts; i++) {
@ -564,11 +580,22 @@ ngx_http_range_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
return NGX_ERROR; return NGX_ERROR;
} }
b->in_file = 1; b->in_file = buf->in_file;
b->file_pos = range[i].start; b->temporary = buf->temporary;
b->file_last = range[i].end; b->memory = buf->memory;
b->mmap = buf->mmap;
b->file = buf->file; b->file = buf->file;
if (buf->in_file) {
buf->file_pos = range[i].start;
buf->file_last = range[i].end;
}
if (ngx_buf_in_memory(buf)) {
buf->pos = buf->start + (size_t) range[i].start;
buf->last = buf->start + (size_t) range[i].end;
}
dcl = ngx_alloc_chain_link(r->pool); dcl = ngx_alloc_chain_link(r->pool);
if (dcl == NULL) { if (dcl == NULL) {
return NGX_ERROR; return NGX_ERROR;
@ -614,12 +641,10 @@ ngx_http_range_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
return ngx_http_next_body_filter(r, out); return ngx_http_next_body_filter(r, out);
in_memory:
overlapped: overlapped:
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"range in memory buffer or in overlapped buffers"); "range in overlapped buffers");
return NGX_ERROR; return NGX_ERROR;
} }