nginx: src/http/modules/ngx_http_range_filter

annotate src/http/modules/ngx_http_range_filter_module.c @ 3324:616da2ea901f

remove subrequest test in range header, chunked, and header filters: they are run after postpone filter which sends data only in main request context

author	Igor Sysoev <igor@sysoev.ru>
date	Mon, 16 Nov 2009 12:13:17 +0000
parents	896db5a09bd2
children	e0bc43a52382

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	4 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	5
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7 #include <ngx_config.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_core.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_http.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	12 /*
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	13 * the single part format:
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	14 *
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	15 * "HTTP/1.0 206 Partial Content" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	16 * ... header ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	17 * "Content-Type: image/jpeg" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	18 * "Content-Length: SIZE" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	19 * "Content-Range: bytes START-END/SIZE" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	20 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	21 * ... data ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	22 *
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	23 *
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	24 * the mutlipart format:
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	25 *
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	26 * "HTTP/1.0 206 Partial Content" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	27 * ... header ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	28 * "Content-Type: multipart/byteranges; boundary=0123456789" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	29 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	30 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	31 * "--0123456789" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	32 * "Content-Type: image/jpeg" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	33 * "Content-Range: bytes START0-END0/SIZE" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	34 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	35 * ... data ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	36 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	37 * "--0123456789" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	38 * "Content-Type: image/jpeg" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	39 * "Content-Range: bytes START1-END1/SIZE" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	40 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	41 * ... data ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	42 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	43 * "--0123456789--" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	44 */
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	45
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	46
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	47 typedef struct {
963 78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	48 off_t start;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	49 off_t end;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	50 ngx_str_t content_range;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	51 } ngx_http_range_t;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	52
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	53
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	54 typedef struct {
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	55 off_t offset;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	56 ngx_str_t boundary_header;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	57 ngx_array_t ranges;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	58 } ngx_http_range_filter_ctx_t;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	59
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	60
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	61 ngx_int_t ngx_http_range_parse(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	62 ngx_http_range_filter_ctx_t *ctx);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	63 static ngx_int_t ngx_http_range_singlepart_header(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	64 ngx_http_range_filter_ctx_t *ctx);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	65 static ngx_int_t ngx_http_range_multipart_header(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	66 ngx_http_range_filter_ctx_t *ctx);
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	67 static ngx_int_t ngx_http_range_not_satisfiable(ngx_http_request_t *r);
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	68 static ngx_int_t ngx_http_range_test_overlapped(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	69 ngx_http_range_filter_ctx_t ctx, ngx_chain_t in);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	70 static ngx_int_t ngx_http_range_singlepart_body(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	71 ngx_http_range_filter_ctx_t ctx, ngx_chain_t in);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	72 static ngx_int_t ngx_http_range_multipart_body(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	73 ngx_http_range_filter_ctx_t ctx, ngx_chain_t in);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	74
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	75 static ngx_int_t ngx_http_range_header_filter_init(ngx_conf_t *cf);
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	76 static ngx_int_t ngx_http_range_body_filter_init(ngx_conf_t *cf);
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	77
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	78
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	79 static ngx_http_module_t ngx_http_range_header_filter_module_ctx = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	80 NULL, /* preconfiguration */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	81 ngx_http_range_header_filter_init, /* postconfiguration */
177 4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 165 diff changeset	82
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	83 NULL, /* create main configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	84 NULL, /* init main configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	85
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	86 NULL, /* create server configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	87 NULL, /* merge server configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	88
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	89 NULL, /* create location configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	90 NULL, /* merge location configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	91 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	92
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	93
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	94 ngx_module_t ngx_http_range_header_filter_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	95 NGX_MODULE_V1,
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	96 &ngx_http_range_header_filter_module_ctx, /* module context */
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	97 NULL, /* module directives */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	98 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	99 NULL, /* init master */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	100 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	101 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	102 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	103 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	104 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	105 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	106 NGX_MODULE_V1_PADDING
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	107 };
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	108
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	109
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	110 static ngx_http_module_t ngx_http_range_body_filter_module_ctx = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	111 NULL, /* preconfiguration */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	112 ngx_http_range_body_filter_init, /* postconfiguration */
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	113
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	114 NULL, /* create main configuration */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	115 NULL, /* init main configuration */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	116
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	117 NULL, /* create server configuration */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	118 NULL, /* merge server configuration */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	119
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	120 NULL, /* create location configuration */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	121 NULL, /* merge location configuration */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	122 };
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	123
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	124
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	125 ngx_module_t ngx_http_range_body_filter_module = {
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	126 NGX_MODULE_V1,
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	127 &ngx_http_range_body_filter_module_ctx, /* module context */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	128 NULL, /* module directives */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	129 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	130 NULL, /* init master */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	131 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	132 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	133 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	134 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	135 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	136 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	137 NGX_MODULE_V1_PADDING
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	138 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	139
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	140
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	141 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	142 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	143
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	144
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	145 static ngx_int_t
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	146 ngx_http_range_header_filter(ngx_http_request_t *r)
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	147 {
1630 9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	148 time_t if_range;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	149 ngx_int_t rc;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	150 ngx_http_range_filter_ctx_t *ctx;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	151
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	152 if (r->http_version < NGX_HTTP_VERSION_10
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	153 \|\| r->headers_out.status != NGX_HTTP_OK
153 c71aeb75c071 nginx-0.0.1-2003-10-21-20:49:56 import Igor Sysoev <igor@sysoev.ru> parents: 136 diff changeset	154 \|\| r->headers_out.content_length_n == -1
581 326634fb9d47 nginx-0.3.12-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	155 \|\| !r->allow_ranges)
117 f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import Igor Sysoev <igor@sysoev.ru> parents: 113 diff changeset	156 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	157 return ngx_http_next_header_filter(r);
117 f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import Igor Sysoev <igor@sysoev.ru> parents: 113 diff changeset	158 }
f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import Igor Sysoev <igor@sysoev.ru> parents: 113 diff changeset	159
f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import Igor Sysoev <igor@sysoev.ru> parents: 113 diff changeset	160 if (r->headers_in.range == NULL
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	161 \|\| r->headers_in.range->value.len < 7
1107 db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 1093 diff changeset	162 \|\| ngx_strncasecmp(r->headers_in.range->value.data,
db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 1093 diff changeset	163 (u_char *) "bytes=", 6)
db7c468c447d ngx_strcasecmp()/ngx_strncasecmp() Igor Sysoev <igor@sysoev.ru> parents: 1093 diff changeset	164 != 0)
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	165 {
1630 9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	166 goto next_filter;
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	167 }
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	168
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	169 if (r->headers_in.if_range && r->headers_out.last_modified_time != -1) {
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	170
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	171 if_range = ngx_http_parse_time(r->headers_in.if_range->value.data,
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	172 r->headers_in.if_range->value.len);
117 f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import Igor Sysoev <igor@sysoev.ru> parents: 113 diff changeset	173
1630 9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	174 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	175 "http ir:%d lm:%d",
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	176 if_range, r->headers_out.last_modified_time);
117 f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import Igor Sysoev <igor@sysoev.ru> parents: 113 diff changeset	177
1630 9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	178 if (if_range != r->headers_out.last_modified_time) {
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	179 goto next_filter;
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	180 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	181 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	182
963 78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	183 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_range_filter_ctx_t));
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	184 if (ctx == NULL) {
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	185 return NGX_ERROR;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	186 }
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	187
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	188 if (ngx_array_init(&ctx->ranges, r->pool, 1, sizeof(ngx_http_range_t))
2536 a6d6d762c554 small optimization: " == NGX_ERROR" > " != NGX_OK" Igor Sysoev <igor@sysoev.ru> parents: 2269 diff changeset	189 != NGX_OK)
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	190 {
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	191 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	192 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	193
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	194 rc = ngx_http_range_parse(r, ctx);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	195
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	196 if (rc == NGX_OK) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	197
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	198 ngx_http_set_ctx(r, ctx, ngx_http_range_body_filter_module);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	199
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	200 r->headers_out.status = NGX_HTTP_PARTIAL_CONTENT;
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	201 r->headers_out.status_line.len = 0;
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	202
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	203 if (ctx->ranges.nelts == 1) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	204 return ngx_http_range_singlepart_header(r, ctx);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	205 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	206
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	207 return ngx_http_range_multipart_header(r, ctx);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	208 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	209
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	210 if (rc == NGX_HTTP_RANGE_NOT_SATISFIABLE) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	211 return ngx_http_range_not_satisfiable(r);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	212 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	213
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	214 /* rc == NGX_ERROR */
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	215
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	216 return rc;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	217
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	218 next_filter:
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	219
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	220 r->headers_out.accept_ranges = ngx_list_push(&r->headers_out.headers);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	221 if (r->headers_out.accept_ranges == NULL) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	222 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	223 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	224
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	225 r->headers_out.accept_ranges->hash = 1;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	226 r->headers_out.accept_ranges->key.len = sizeof("Accept-Ranges") - 1;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	227 r->headers_out.accept_ranges->key.data = (u_char *) "Accept-Ranges";
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	228 r->headers_out.accept_ranges->value.len = sizeof("bytes") - 1;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	229 r->headers_out.accept_ranges->value.data = (u_char *) "bytes";
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	230
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	231 return ngx_http_next_header_filter(r);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	232 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	233
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	234
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	235 ngx_int_t
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	236 ngx_http_range_parse(ngx_http_request_t r, ngx_http_range_filter_ctx_t ctx)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	237 {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	238 u_char *p;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	239 off_t start, end;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	240 ngx_uint_t suffix;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	241 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	242
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	243 p = r->headers_in.range->value.data + 6;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	244
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	245 for ( ;; ) {
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	246 start = 0;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	247 end = 0;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	248 suffix = 0;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	249
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	250 while (*p == ' ') { p++; }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	251
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	252 if (*p != '-') {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	253 if (p < '0' \|\| p > '9') {
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	254 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	255 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	256
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	257 while (p >= '0' && p <= '9') {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	258 start = start * 10 + *p++ - '0';
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	259 }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	260
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	261 while (*p == ' ') { p++; }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	262
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	263 if (*p++ != '-') {
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	264 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	265 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	266
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	267 if (start >= r->headers_out.content_length_n) {
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	268 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	269 }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	270
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	271 while (*p == ' ') { p++; }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	272
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	273 if (p == ',' \|\| p == '\0') {
963 78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	274 range = ngx_array_push(&ctx->ranges);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	275 if (range == NULL) {
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	276 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	277 }
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	278
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	279 range->start = start;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	280 range->end = r->headers_out.content_length_n;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	281
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	282 if (*p++ != ',') {
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	283 return NGX_OK;
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	284 }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	285
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	286 continue;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	287 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	288
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	289 } else {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	290 suffix = 1;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	291 p++;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	292 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	293
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	294 if (p < '0' \|\| p > '9') {
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	295 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	296 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	297
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	298 while (p >= '0' && p <= '9') {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	299 end = end * 10 + *p++ - '0';
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	300 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	301
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	302 while (*p == ' ') { p++; }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	303
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	304 if (p != ',' && p != '\0') {
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	305 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	306 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	307
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	308 if (suffix) {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	309 start = r->headers_out.content_length_n - end;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	310 end = r->headers_out.content_length_n - 1;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	311 }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	312
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	313 if (start > end) {
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	314 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	315 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	316
963 78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	317 range = ngx_array_push(&ctx->ranges);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	318 if (range == NULL) {
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	319 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	320 }
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	321
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	322 range->start = start;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	323
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	324 if (end >= r->headers_out.content_length_n) {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	325 /*
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	326 * Download Accelerator sends the last byte position
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	327 * that equals to the file length
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	328 */
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	329 range->end = r->headers_out.content_length_n;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	330
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	331 } else {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	332 range->end = end + 1;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	333 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	334
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	335 if (*p++ != ',') {
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	336 return NGX_OK;
231 92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import Igor Sysoev <igor@sysoev.ru> parents: 195 diff changeset	337 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	338 }
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	339 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	340
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	341
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	342 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	343 ngx_http_range_singlepart_header(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	344 ngx_http_range_filter_ctx_t *ctx)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	345 {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	346 ngx_table_elt_t *content_range;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	347 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	348
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	349 content_range = ngx_list_push(&r->headers_out.headers);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	350 if (content_range == NULL) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	351 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	352 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	353
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	354 r->headers_out.content_range = content_range;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	355
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	356 content_range->hash = 1;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	357 content_range->key.len = sizeof("Content-Range") - 1;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	358 content_range->key.data = (u_char *) "Content-Range";
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	359
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	360 content_range->value.data = ngx_pnalloc(r->pool,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	361 sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	362 if (content_range->value.data == NULL) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	363 return NGX_ERROR;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	364 }
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	365
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	366 /* "Content-Range: bytes SSSS-EEEE/TTTT" header */
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	367
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	368 range = ctx->ranges.elts;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	369
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	370 content_range->value.len = ngx_sprintf(content_range->value.data,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	371 "bytes %O-%O/%O",
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	372 range->start, range->end - 1,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	373 r->headers_out.content_length_n)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	374 - content_range->value.data;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	375
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	376 r->headers_out.content_length_n = range->end - range->start;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	377
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	378 if (r->headers_out.content_length) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	379 r->headers_out.content_length->hash = 0;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	380 r->headers_out.content_length = NULL;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	381 }
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	382
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	383 return ngx_http_next_header_filter(r);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	384 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	385
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	386
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	387 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	388 ngx_http_range_multipart_header(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	389 ngx_http_range_filter_ctx_t *ctx)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	390 {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	391 size_t len;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	392 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	393 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	394 ngx_atomic_uint_t boundary;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	395
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	396 len = sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	397 + sizeof(CRLF "Content-Type: ") - 1
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	398 + r->headers_out.content_type.len
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	399 + sizeof(CRLF "Content-Range: bytes ") - 1;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	400
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	401 if (r->headers_out.charset.len) {
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	402 len += sizeof("; charset=") - 1 + r->headers_out.charset.len;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	403 }
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	404
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1630 diff changeset	405 ctx->boundary_header.data = ngx_pnalloc(r->pool, len);
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	406 if (ctx->boundary_header.data == NULL) {
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	407 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	408 }
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	409
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	410 boundary = ngx_next_temp_number(0);
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	411
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	412 /*
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	413 * The boundary header of the range:
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	414 * CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	415 * "--0123456789" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	416 * "Content-Type: image/jpeg" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	417 * "Content-Range: bytes "
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	418 */
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	419
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	420 if (r->headers_out.charset.len) {
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	421 ctx->boundary_header.len = ngx_sprintf(ctx->boundary_header.data,
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	422 CRLF "--%0muA" CRLF
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	423 "Content-Type: %V; charset=%V" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	424 "Content-Range: bytes ",
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	425 boundary,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	426 &r->headers_out.content_type,
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	427 &r->headers_out.charset)
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	428 - ctx->boundary_header.data;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	429
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	430 r->headers_out.charset.len = 0;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	431
2119 0799703985ef fix ranges without Content-Type Igor Sysoev <igor@sysoev.ru> parents: 2118 diff changeset	432 } else if (r->headers_out.content_type.len) {
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	433 ctx->boundary_header.len = ngx_sprintf(ctx->boundary_header.data,
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	434 CRLF "--%0muA" CRLF
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	435 "Content-Type: %V" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	436 "Content-Range: bytes ",
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	437 boundary,
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	438 &r->headers_out.content_type)
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	439 - ctx->boundary_header.data;
2119 0799703985ef fix ranges without Content-Type Igor Sysoev <igor@sysoev.ru> parents: 2118 diff changeset	440
0799703985ef fix ranges without Content-Type Igor Sysoev <igor@sysoev.ru> parents: 2118 diff changeset	441 } else {
0799703985ef fix ranges without Content-Type Igor Sysoev <igor@sysoev.ru> parents: 2118 diff changeset	442 ctx->boundary_header.len = ngx_sprintf(ctx->boundary_header.data,
0799703985ef fix ranges without Content-Type Igor Sysoev <igor@sysoev.ru> parents: 2118 diff changeset	443 CRLF "--%0muA" CRLF
0799703985ef fix ranges without Content-Type Igor Sysoev <igor@sysoev.ru> parents: 2118 diff changeset	444 "Content-Range: bytes ",
0799703985ef fix ranges without Content-Type Igor Sysoev <igor@sysoev.ru> parents: 2118 diff changeset	445 boundary)
0799703985ef fix ranges without Content-Type Igor Sysoev <igor@sysoev.ru> parents: 2118 diff changeset	446 - ctx->boundary_header.data;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	447 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	448
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	449 r->headers_out.content_type.data =
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1630 diff changeset	450 ngx_pnalloc(r->pool,
2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1630 diff changeset	451 sizeof("Content-Type: multipart/byteranges; boundary=") - 1
2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1630 diff changeset	452 + NGX_ATOMIC_T_LEN);
165 894a01c6aea3 nginx-0.0.1-2003-10-29-20:39:05 import Igor Sysoev <igor@sysoev.ru> parents: 164 diff changeset	453
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	454 if (r->headers_out.content_type.data == NULL) {
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	455 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	456 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	457
2882 896db5a09bd2 reset content_type hash value, this fixes a bug when XSLT responses Igor Sysoev <igor@sysoev.ru> parents: 2592 diff changeset	458 r->headers_out.content_type_lowcase = NULL;
896db5a09bd2 reset content_type hash value, this fixes a bug when XSLT responses Igor Sysoev <igor@sysoev.ru> parents: 2592 diff changeset	459
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	460 /* "Content-Type: multipart/byteranges; boundary=0123456789" */
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	461
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	462 r->headers_out.content_type.len =
9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	463 ngx_sprintf(r->headers_out.content_type.data,
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	464 "multipart/byteranges; boundary=%0muA",
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	465 boundary)
509 9b8c906f6e63 nginx-0.1.29-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 501 diff changeset	466 - r->headers_out.content_type.data;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	467
2882 896db5a09bd2 reset content_type hash value, this fixes a bug when XSLT responses Igor Sysoev <igor@sysoev.ru> parents: 2592 diff changeset	468 r->headers_out.content_type_len = r->headers_out.content_type.len;
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	469
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	470 /* the size of the last boundary CRLF "--0123456789--" CRLF */
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	471
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	472 len = sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN + sizeof("--" CRLF) - 1;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	473
963 78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	474 range = ctx->ranges.elts;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	475 for (i = 0; i < ctx->ranges.nelts; i++) {
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	476
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	477 /* the size of the range: "SSSS-EEEE/TTTT" CRLF CRLF */
455 295d97d70c69 nginx-0.1.2-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	478
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	479 range[i].content_range.data =
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1630 diff changeset	480 ngx_pnalloc(r->pool, 3 * NGX_OFF_T_LEN + 2 + 4);
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	481
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	482 if (range[i].content_range.data == NULL) {
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	483 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	484 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	485
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	486 range[i].content_range.len = ngx_sprintf(range[i].content_range.data,
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	487 "%O-%O/%O" CRLF CRLF,
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	488 range[i].start, range[i].end - 1,
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	489 r->headers_out.content_length_n)
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	490 - range[i].content_range.data;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	491
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	492 len += ctx->boundary_header.len + range[i].content_range.len
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	493 + (size_t) (range[i].end - range[i].start);
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	494 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	495
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	496 r->headers_out.content_length_n = len;
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	497
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	498 if (r->headers_out.content_length) {
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	499 r->headers_out.content_length->hash = 0;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	500 r->headers_out.content_length = NULL;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	501 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	502
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	503 return ngx_http_next_header_filter(r);
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	504 }
1630 9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	505
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	506
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	507 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	508 ngx_http_range_not_satisfiable(ngx_http_request_t *r)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	509 {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	510 ngx_table_elt_t *content_range;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	511
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	512 r->headers_out.status = NGX_HTTP_RANGE_NOT_SATISFIABLE;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	513
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	514 content_range = ngx_list_push(&r->headers_out.headers);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	515 if (content_range == NULL) {
1630 9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	516 return NGX_ERROR;
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	517 }
9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	518
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	519 r->headers_out.content_range = content_range;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	520
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	521 content_range->hash = 1;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	522 content_range->key.len = sizeof("Content-Range") - 1;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	523 content_range->key.data = (u_char *) "Content-Range";
1630 9706372f8916 If-Range support Igor Sysoev <igor@sysoev.ru> parents: 1195 diff changeset	524
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	525 content_range->value.data = ngx_pnalloc(r->pool,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	526 sizeof("bytes */") - 1 + NGX_OFF_T_LEN);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	527 if (content_range->value.data == NULL) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	528 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	529 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	530
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	531 content_range->value.len = ngx_sprintf(content_range->value.data,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	532 "bytes */%O",
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	533 r->headers_out.content_length_n)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	534 - content_range->value.data;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	535
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	536 ngx_http_clear_content_length(r);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	537
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	538 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	539 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	540
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	541
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	542 static ngx_int_t
975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	543 ngx_http_range_body_filter(ngx_http_request_t r, ngx_chain_t in)
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	544 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	545 ngx_http_range_filter_ctx_t *ctx;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	546
963 78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	547 if (in == NULL) {
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	548 return ngx_http_next_body_filter(r, in);
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	549 }
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	550
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	551 ctx = ngx_http_get_module_ctx(r, ngx_http_range_body_filter_module);
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	552
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	553 if (ctx == NULL) {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	554 return ngx_http_next_body_filter(r, in);
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	555 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	556
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	557 if (ctx->ranges.nelts == 1) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	558 return ngx_http_range_singlepart_body(r, ctx, in);
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	559 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	560
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	561 /*
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	562 * multipart ranges are supported only if whole body is in a single buffer
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	563 */
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	564
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	565 if (ngx_buf_special(in->buf)) {
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	566 return ngx_http_next_body_filter(r, in);
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	567 }
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	568
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	569 if (ngx_http_range_test_overlapped(r, ctx, in) != NGX_OK) {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	570 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	571 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	572
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	573 return ngx_http_range_multipart_body(r, ctx, in);
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	574 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	575
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	576
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	577 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	578 ngx_http_range_test_overlapped(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	579 ngx_http_range_filter_ctx_t ctx, ngx_chain_t in)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	580 {
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	581 off_t start, last;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	582 ngx_buf_t *buf;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	583 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	584 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	585
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	586 if (ctx->offset) {
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	587 goto overlapped;
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	588 }
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	589
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	590 buf = in->buf;
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	591
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	592 if (!buf->last_buf) {
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	593
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	594 if (buf->in_file) {
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	595 start = buf->file_pos + ctx->offset;
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	596 last = buf->file_last + ctx->offset;
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	597
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	598 } else {
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	599 start = buf->pos - buf->start + ctx->offset;
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	600 last = buf->last - buf->start + ctx->offset;
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	601 }
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	602
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	603 range = ctx->ranges.elts;
963 78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	604 for (i = 0; i < ctx->ranges.nelts; i++) {
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	605 if (start > range[i].start \|\| last < range[i].end) {
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	606 goto overlapped;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	607 }
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	608 }
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	609 }
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	610
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	611 ctx->offset = ngx_buf_size(buf);
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	612
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	613 return NGX_OK;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	614
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	615 overlapped:
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	616
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	617 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	618 "range in overlapped buffers");
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	619
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	620 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	621 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	622
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	623
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	624 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	625 ngx_http_range_singlepart_body(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	626 ngx_http_range_filter_ctx_t ctx, ngx_chain_t in)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	627 {
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	628 off_t start, last;
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	629 ngx_buf_t *buf;
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	630 ngx_chain_t out, cl, **ll;
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	631 ngx_http_range_t *range;
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	632
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	633 out = NULL;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	634 ll = &out;
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	635 range = ctx->ranges.elts;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	636
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	637 for (cl = in; cl; cl = cl->next) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	638
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	639 buf = cl->buf;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	640
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	641 start = ctx->offset;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	642 last = ctx->offset + ngx_buf_size(buf);
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	643
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	644 ctx->offset = last;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	645
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	646 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	647 "http range body buf: %O-%O", start, last);
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	648
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	649 if (ngx_buf_special(buf)) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	650 *ll = cl;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	651 ll = &cl->next;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	652 continue;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	653 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	654
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	655 if (range->end <= start \|\| range->start >= last) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	656
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	657 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	658 "http range body skip");
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	659
2269 7155dbb2317e fix r2122: Igor Sysoev <igor@sysoev.ru> parents: 2121 diff changeset	660 if (buf->in_file) {
7155dbb2317e fix r2122: Igor Sysoev <igor@sysoev.ru> parents: 2121 diff changeset	661 buf->file_pos = buf->file_last;
7155dbb2317e fix r2122: Igor Sysoev <igor@sysoev.ru> parents: 2121 diff changeset	662 }
7155dbb2317e fix r2122: Igor Sysoev <igor@sysoev.ru> parents: 2121 diff changeset	663
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	664 buf->pos = buf->last;
2269 7155dbb2317e fix r2122: Igor Sysoev <igor@sysoev.ru> parents: 2121 diff changeset	665 buf->sync = 1;
7155dbb2317e fix r2122: Igor Sysoev <igor@sysoev.ru> parents: 2121 diff changeset	666
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	667 continue;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	668 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	669
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	670 if (range->start > start) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	671
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	672 if (buf->in_file) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	673 buf->file_pos += range->start - start;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	674 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	675
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	676 if (ngx_buf_in_memory(buf)) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	677 buf->pos += (size_t) (range->start - start);
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	678 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	679 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	680
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	681 if (range->end <= last) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	682
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	683 if (buf->in_file) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	684 buf->file_last -= last - range->end;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	685 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	686
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	687 if (ngx_buf_in_memory(buf)) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	688 buf->last -= (size_t) (last - range->end);
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	689 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	690
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	691 buf->last_buf = 1;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	692 *ll = cl;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	693 cl->next = NULL;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	694
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	695 break;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	696 }
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	697
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	698 *ll = cl;
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	699 ll = &cl->next;
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	700 }
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	701
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	702 if (out == NULL) {
b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	703 return NGX_OK;
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	704 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	705
2121 b39c0040b3e4 support several buf's for single-part range Igor Sysoev <igor@sysoev.ru> parents: 2119 diff changeset	706 return ngx_http_next_body_filter(r, out);
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	707 }
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	708
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	709
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	710 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	711 ngx_http_range_multipart_body(ngx_http_request_t *r,
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	712 ngx_http_range_filter_ctx_t ctx, ngx_chain_t in)
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	713 {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	714 off_t body_start;
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	715 ngx_buf_t b, buf;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	716 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	717 ngx_chain_t out, hcl, rcl, dcl, **ll;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	718 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	719
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	720 ll = &out;
2118 c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	721 buf = in->buf;
c1f589732d8c split ngx_http_range_filter_module Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	722 range = ctx->ranges.elts;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	723
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	724 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	725 body_start = r->cached ? r->cache->body_start : 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	726 #else
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	727 body_start = 0;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	728 #endif
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	729
963 78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t Igor Sysoev <igor@sysoev.ru> parents: 962 diff changeset	730 for (i = 0; i < ctx->ranges.nelts; i++) {
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	731
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	732 /*
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	733 * The boundary header of the range:
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	734 * CRLF
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	735 * "--0123456789" CRLF
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	736 * "Content-Type: image/jpeg" CRLF
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	737 * "Content-Range: bytes "
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	738 */
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	739
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	740 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	741 if (b == NULL) {
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	742 return NGX_ERROR;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	743 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	744
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	745 b->memory = 1;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	746 b->pos = ctx->boundary_header.data;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	747 b->last = ctx->boundary_header.data + ctx->boundary_header.len;
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	748
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	749 hcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	750 if (hcl == NULL) {
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	751 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	752 }
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	753
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	754 hcl->buf = b;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	755
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	756
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	757 /* "SSSS-EEEE/TTTT" CRLF CRLF */
160 e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	758
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	759 b = ngx_calloc_buf(r->pool);
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 499 diff changeset	760 if (b == NULL) {
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	761 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	762 }
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	763
343 6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t Igor Sysoev <igor@sysoev.ru> parents: 335 diff changeset	764 b->temporary = 1;
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	765 b->pos = range[i].content_range.data;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	766 b->last = range[i].content_range.data + range[i].content_range.len;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	767
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	768 rcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	769 if (rcl == NULL) {
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	770 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	771 }
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	772
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	773 rcl->buf = b;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	774
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	775
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	776 /* the range data */
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	777
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	778 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	779 if (b == NULL) {
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	780 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	781 }
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	782
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	783 b->in_file = buf->in_file;
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	784 b->temporary = buf->temporary;
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	785 b->memory = buf->memory;
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	786 b->mmap = buf->mmap;
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	787 b->file = buf->file;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	788
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	789 if (buf->in_file) {
2592 3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	790 b->file_pos = body_start + range[i].start;
3a8a53c0c42f a prelimiary proxy cache support Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	791 b->file_last = body_start + range[i].end;
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	792 }
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	793
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	794 if (ngx_buf_in_memory(buf)) {
1093 d0fb2cc2a098 fix several ranges Igor Sysoev <igor@sysoev.ru> parents: 963 diff changeset	795 b->pos = buf->start + (size_t) range[i].start;
d0fb2cc2a098 fix several ranges Igor Sysoev <igor@sysoev.ru> parents: 963 diff changeset	796 b->last = buf->start + (size_t) range[i].end;
962 69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	797 }
69754fb59ba1 support ranges for single memory buffer Igor Sysoev <igor@sysoev.ru> parents: 961 diff changeset	798
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	799 dcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	800 if (dcl == NULL) {
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	801 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	802 }
a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	803
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	804 dcl->buf = b;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	805
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	806 *ll = hcl;
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	807 hcl->next = rcl;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	808 rcl->next = dcl;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	809 ll = &dcl->next;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	810 }
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	811
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	812 /* the last boundary CRLF "--0123456789--" CRLF */
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	813
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	814 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	815 if (b == NULL) {
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	816 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	817 }
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	818
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	819 b->temporary = 1;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	820 b->last_buf = 1;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	821
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1630 diff changeset	822 b->pos = ngx_pnalloc(r->pool, sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1630 diff changeset	823 + sizeof("--" CRLF) - 1);
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	824 if (b->pos == NULL) {
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	825 return NGX_ERROR;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	826 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	827
1195 4ba6df5d5b53 fix multipart ranges trailing Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	828 b->last = ngx_cpymem(b->pos, ctx->boundary_header.data,
4ba6df5d5b53 fix multipart ranges trailing Igor Sysoev <igor@sysoev.ru> parents: 1107 diff changeset	829 sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN);
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	830 b->last++ = '-'; b->last++ = '-';
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	831 b->last++ = CR; b->last++ = LF;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	832
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	833 hcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	834 if (hcl == NULL) {
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	835 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	836 }
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	837
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	838 hcl->buf = b;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	839 hcl->next = NULL;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	840
960 20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	841 *ll = hcl;
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	842
20279ed90b19 fix range in $r->sendfile Igor Sysoev <igor@sysoev.ru> parents: 959 diff changeset	843 return ngx_http_next_body_filter(r, out);
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	844 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	845
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	846
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	847 static ngx_int_t
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	848 ngx_http_range_header_filter_init(ngx_conf_t *cf)
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	849 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	850 ngx_http_next_header_filter = ngx_http_top_header_filter;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	851 ngx_http_top_header_filter = ngx_http_range_header_filter;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	852
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	853 return NGX_OK;
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	854 }
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	855
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	856
493 975f62e77f02 nginx-0.1.21-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 467 diff changeset	857 static ngx_int_t
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 657 diff changeset	858 ngx_http_range_body_filter_init(ngx_conf_t *cf)
334 af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import Igor Sysoev <igor@sysoev.ru> parents: 314 diff changeset	859 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	860 ngx_http_next_body_filter = ngx_http_top_body_filter;
99 a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	861 ngx_http_top_body_filter = ngx_http_range_body_filter;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	862
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	863 return NGX_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	864 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_range_filter_module.c @ 3324:616da2ea901f