Klaus Demo nginx / 4a1b032
support several buf's for single-part range patch by Maxim Dounin Igor Sysoev 13 years ago
1 changed file(s) with 77 addition(s) and 23 deletion(s). Raw diff Collapse all Expand all
+77
-23
src/http/modules/ngx_http_range_filter_module.c less more
6363 ngx_http_range_filter_ctx_t *ctx);
6464 static ngx_int_t ngx_http_range_multipart_header(ngx_http_request_t *r,
6565 ngx_http_range_filter_ctx_t *ctx);
66 static ngx_int_t ngx_http_range_not_satisfiable(ngx_http_request_t *r);
6667 static ngx_int_t ngx_http_range_test_overlapped(ngx_http_request_t *r,
6768 ngx_http_range_filter_ctx_t *ctx, ngx_chain_t *in);
6869 static ngx_int_t ngx_http_range_singlepart_body(ngx_http_request_t *r,
6970 ngx_http_range_filter_ctx_t *ctx, ngx_chain_t *in);
7071 static ngx_int_t ngx_http_range_multipart_body(ngx_http_request_t *r,
7172 ngx_http_range_filter_ctx_t *ctx, ngx_chain_t *in);
72 static ngx_int_t ngx_http_range_not_satisfiable(ngx_http_request_t *r);
7373
7474 static ngx_int_t ngx_http_range_header_filter_init(ngx_conf_t *cf);
7575 static ngx_int_t ngx_http_range_body_filter_init(ngx_conf_t *cf);
550550 return ngx_http_next_body_filter(r, in);
551551 }
552552
553 if (ctx->ranges.nelts == 1) {
554 return ngx_http_range_singlepart_body(r, ctx, in);
555 }
556
557 /*
558 * multipart ranges are supported only if whole body is in a single buffer
559 */
560
553561 if (ngx_buf_special(in->buf)) {
554562 return ngx_http_next_body_filter(r, in);
555563 }
556564
557565 if (ngx_http_range_test_overlapped(r, ctx, in) != NGX_OK) {
558566 return NGX_ERROR;
559 }
560
561 if (ctx->ranges.nelts == 1) {
562
563 /*
564 * the optimized version for the responses
565 * that are passed in the single buffer
566 */
567
568 return ngx_http_range_singlepart_body(r, ctx, in);
569567 }
570568
571569 return ngx_http_range_multipart_body(r, ctx, in);
623621 ngx_http_range_singlepart_body(ngx_http_request_t *r,
624622 ngx_http_range_filter_ctx_t *ctx, ngx_chain_t *in)
625623 {
624 off_t start, last;
626625 ngx_buf_t *buf;
626 ngx_chain_t *out, *cl, **ll;
627627 ngx_http_range_t *range;
628628
629 buf = in->buf;
629 out = NULL;
630 ll = &out;
630631 range = ctx->ranges.elts;
631632
632 if (buf->in_file) {
633 buf->file_pos = range->start;
634 buf->file_last = range->end;
635 }
636
637 if (ngx_buf_in_memory(buf)) {
638 buf->pos = buf->start + (size_t) range->start;
639 buf->last = buf->start + (size_t) range->end;
640 }
641
642 return ngx_http_next_body_filter(r, in);
633 for (cl = in; cl; cl = cl->next) {
634
635 buf = cl->buf;
636
637 start = ctx->offset;
638 last = ctx->offset + ngx_buf_size(buf);
639
640 ctx->offset = last;
641
642 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
643 "http range body buf: %O-%O", start, last);
644
645 if (ngx_buf_special(buf)) {
646 *ll = cl;
647 ll = &cl->next;
648 continue;
649 }
650
651 if (range->end <= start || range->start >= last) {
652
653 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
654 "http range body skip");
655
656 buf->pos = buf->last;
657 continue;
658 }
659
660 if (range->start > start) {
661
662 if (buf->in_file) {
663 buf->file_pos += range->start - start;
664 }
665
666 if (ngx_buf_in_memory(buf)) {
667 buf->pos += (size_t) (range->start - start);
668 }
669 }
670
671 if (range->end <= last) {
672
673 if (buf->in_file) {
674 buf->file_last -= last - range->end;
675 }
676
677 if (ngx_buf_in_memory(buf)) {
678 buf->last -= (size_t) (last - range->end);
679 }
680
681 buf->last_buf = 1;
682 *ll = cl;
683 cl->next = NULL;
684
685 break;
686 }
687
688 *ll = cl;
689 ll = &cl->next;
690 }
691
692 if (out == NULL) {
693 return NGX_OK;
694 }
695
696 return ngx_http_next_body_filter(r, out);
643697 }
644698
645699