annotate src/http/modules/ngx_http_range_filter_module.c @ 4162:fb1375e8b68c stable-1.0

Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063, r4064: Ranges related fixes: The "max_ranges" directive. "max_ranges 0" disables ranges support at all, "max_ranges 1" allows the single range, etc. By default number of ranges is unlimited, to be precise, 2^31-1. If client requests more ranges than "max_ranges" permits, nginx disables ranges and returns just the source response. If total size of all ranges is greater than source response size, then nginx disables ranges and returns just the source response. This fix should not affect well-behaving applications but will defeat DoS attempts exploiting malicious byte ranges. Now unsatisfiable ranges are processed according to RFC 2616.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 30 Sep 2011 14:06:08 +0000
parents dd1570b6f237
children 4919fb357a5d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
61 static ngx_int_t ngx_http_range_parse(ngx_http_request_t *r,
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
62 ngx_http_range_filter_ctx_t *ctx, ngx_uint_t ranges);
2118
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;
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
149 ngx_http_core_loc_conf_t *clcf;
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
3331
e0bc43a52382 backout r3325: postpone filter is a body only filter
Igor Sysoev <igor@sysoev.ru>
parents: 3324
diff changeset
154 || r != r->main
153
c71aeb75c071 nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents: 136
diff changeset
155 || r->headers_out.content_length_n == -1
581
326634fb9d47 nginx-0.3.12-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
156 || !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
157 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
158 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
159 }
f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
160
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
161 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
163 if (clcf->max_ranges == 0) {
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
164 return ngx_http_next_header_filter(r);
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
165 }
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
166
117
f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
167 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
168 || r->headers_in.range->value.len < 7
1107
db7c468c447d ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents: 1093
diff changeset
169 || ngx_strncasecmp(r->headers_in.range->value.data,
db7c468c447d ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents: 1093
diff changeset
170 (u_char *) "bytes=", 6)
db7c468c447d ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents: 1093
diff changeset
171 != 0)
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
172 {
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
173 goto next_filter;
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
174 }
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
175
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
176 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
177
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
178 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
179 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
180
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
181 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
182 "http ir:%d lm:%d",
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
183 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
184
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
185 if (if_range != r->headers_out.last_modified_time) {
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
186 goto next_filter;
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
187 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
188 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
189
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
190 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
191 if (ctx == NULL) {
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
192 return NGX_ERROR;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
193 }
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
194
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
195 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
196 != NGX_OK)
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
197 {
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
198 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
199 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
200
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
201 switch (ngx_http_range_parse(r, ctx, clcf->max_ranges)) {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
202
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
203 case NGX_OK:
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
204 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
205
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
206 r->headers_out.status = NGX_HTTP_PARTIAL_CONTENT;
2592
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
207 r->headers_out.status_line.len = 0;
2118
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 if (ctx->ranges.nelts == 1) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
210 return ngx_http_range_singlepart_header(r, ctx);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
211 }
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 return ngx_http_range_multipart_header(r, ctx);
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
214
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
215 case NGX_HTTP_RANGE_NOT_SATISFIABLE:
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
216 return ngx_http_range_not_satisfiable(r);
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
217
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
218 case NGX_ERROR:
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
219 return NGX_ERROR;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
220
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
221 default: /* NGX_DECLINED */
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
222 break;
2118
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 next_filter:
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
226
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
227 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
228 if (r->headers_out.accept_ranges == NULL) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
229 return NGX_ERROR;
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
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
232 r->headers_out.accept_ranges->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3331
diff changeset
233 ngx_str_set(&r->headers_out.accept_ranges->key, "Accept-Ranges");
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3331
diff changeset
234 ngx_str_set(&r->headers_out.accept_ranges->value, "bytes");
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
235
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
236 return ngx_http_next_header_filter(r);
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
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
239
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
240 static ngx_int_t
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
241 ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
242 ngx_uint_t ranges)
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
243 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
244 u_char *p;
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
245 off_t start, end, size, content_length;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
246 ngx_uint_t suffix;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
247 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
248
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
249 p = r->headers_in.range->value.data + 6;
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
250 size = 0;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
251 content_length = 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
252
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
253 for ( ;; ) {
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
254 start = 0;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
255 end = 0;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
256 suffix = 0;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
257
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
258 while (*p == ' ') { p++; }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
259
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
260 if (*p != '-') {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
261 if (*p < '0' || *p > '9') {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
262 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
263 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
264
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
265 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
266 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
267 }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
268
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
269 while (*p == ' ') { p++; }
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 if (*p++ != '-') {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
272 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
273 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
274
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
275 while (*p == ' ') { p++; }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
276
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
277 if (*p == ',' || *p == '\0') {
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
278 end = content_length;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
279 goto found;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
280 }
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 } else {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
283 suffix = 1;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
284 p++;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
285 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
286
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
287 if (*p < '0' || *p > '9') {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
288 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
289 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
290
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
291 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
292 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
293 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
294
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
295 while (*p == ' ') { p++; }
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 if (*p != ',' && *p != '\0') {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
298 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
299 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
300
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
301 if (suffix) {
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
302 start = content_length - end;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
303 end = content_length - 1;
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
304 }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
305
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
306 if (end >= content_length) {
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
307 end = content_length;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
308
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
309 } else {
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
310 end++;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
311 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
312
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
313 found:
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
314
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
315 if (start < end) {
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
316 range = ngx_array_push(&ctx->ranges);
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
317 if (range == NULL) {
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
318 return NGX_ERROR;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
319 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
320
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
321 range->start = start;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
322 range->end = end;
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
323
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
324 size += end - start;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
325
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
326 if (ranges-- == 0) {
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
327 return NGX_DECLINED;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
328 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
329 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
330
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
331 if (*p++ != ',') {
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
332 break;
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
333 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
334 }
4162
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
335
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
336 if (ctx->ranges.nelts == 0) {
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
337 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
338 }
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
339
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
340 if (size > content_length) {
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
341 return NGX_DECLINED;
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
342 }
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
343
fb1375e8b68c Merging r4036, r4055, r4056, r4057, r4058, r4059, r4060, r4061, r4062, r4063,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
344 return NGX_OK;
2118
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
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
347
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
348 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
349 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
350 ngx_http_range_filter_ctx_t *ctx)
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
351 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
352 ngx_table_elt_t *content_range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
353 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
354
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
355 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
356 if (content_range == NULL) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
357 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
358 }
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 r->headers_out.content_range = content_range;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
361
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
362 content_range->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3331
diff changeset
363 ngx_str_set(&content_range->key, "Content-Range");
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
364
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
365 content_range->value.data = ngx_pnalloc(r->pool,
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
366 sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
367 if (content_range->value.data == NULL) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
368 return NGX_ERROR;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
369 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
370
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
371 /* "Content-Range: bytes SSSS-EEEE/TTTT" header */
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
372
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
373 range = ctx->ranges.elts;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
374
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
375 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
376 "bytes %O-%O/%O",
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
377 range->start, range->end - 1,
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
378 r->headers_out.content_length_n)
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
379 - content_range->value.data;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
380
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
381 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
382
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
383 if (r->headers_out.content_length) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
384 r->headers_out.content_length->hash = 0;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
385 r->headers_out.content_length = NULL;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
386 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
387
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
388 return ngx_http_next_header_filter(r);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
389 }
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
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
392 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
393 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
394 ngx_http_range_filter_ctx_t *ctx)
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
395 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
396 size_t len;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
397 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
398 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
399 ngx_atomic_uint_t boundary;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
400
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
401 len = sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
402 + sizeof(CRLF "Content-Type: ") - 1
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
403 + r->headers_out.content_type.len
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
404 + sizeof(CRLF "Content-Range: bytes ") - 1;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
405
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
406 if (r->headers_out.charset.len) {
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
407 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
408 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
409
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
410 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
411 if (ctx->boundary_header.data == NULL) {
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
412 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
413 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
414
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
415 boundary = ngx_next_temp_number(0);
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
416
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
417 /*
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
418 * The boundary header of the range:
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
419 * CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
420 * "--0123456789" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
421 * "Content-Type: image/jpeg" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
422 * "Content-Range: bytes "
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
423 */
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
424
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
425 if (r->headers_out.charset.len) {
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
426 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
427 CRLF "--%0muA" CRLF
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
428 "Content-Type: %V; charset=%V" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
429 "Content-Range: bytes ",
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
430 boundary,
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
431 &r->headers_out.content_type,
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
432 &r->headers_out.charset)
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
433 - ctx->boundary_header.data;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
434
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
435 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
436
2119
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
437 } 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
438 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
439 CRLF "--%0muA" CRLF
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
440 "Content-Type: %V" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
441 "Content-Range: bytes ",
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
442 boundary,
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
443 &r->headers_out.content_type)
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
444 - ctx->boundary_header.data;
2119
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
445
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
446 } else {
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
447 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
448 CRLF "--%0muA" CRLF
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
449 "Content-Range: bytes ",
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
450 boundary)
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
451 - ctx->boundary_header.data;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
452 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
453
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
454 r->headers_out.content_type.data =
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
455 ngx_pnalloc(r->pool,
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
456 sizeof("Content-Type: multipart/byteranges; boundary=") - 1
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
457 + 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
458
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
459 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
460 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
461 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
462
2882
896db5a09bd2 reset content_type hash value, this fixes a bug when XSLT responses
Igor Sysoev <igor@sysoev.ru>
parents: 2592
diff changeset
463 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
464
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
465 /* "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
466
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
467 r->headers_out.content_type.len =
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
468 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
469 "multipart/byteranges; boundary=%0muA",
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
470 boundary)
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
471 - 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
472
2882
896db5a09bd2 reset content_type hash value, this fixes a bug when XSLT responses
Igor Sysoev <igor@sysoev.ru>
parents: 2592
diff changeset
473 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
474
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
475 /* 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
476
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
477 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
478
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
479 range = ctx->ranges.elts;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
480 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
481
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
482 /* 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
483
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
484 range[i].content_range.data =
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
485 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
486
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
487 if (range[i].content_range.data == NULL) {
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
488 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
489 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
490
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
491 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
492 "%O-%O/%O" CRLF CRLF,
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
493 range[i].start, range[i].end - 1,
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
494 r->headers_out.content_length_n)
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
495 - 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
496
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
497 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
498 + (size_t) (range[i].end - range[i].start);
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
499 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
500
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
501 r->headers_out.content_length_n = len;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
502
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
503 if (r->headers_out.content_length) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
504 r->headers_out.content_length->hash = 0;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
505 r->headers_out.content_length = NULL;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
506 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
507
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
508 return ngx_http_next_header_filter(r);
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
509 }
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
510
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
511
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
512 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
513 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
514 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
515 ngx_table_elt_t *content_range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
516
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
517 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
518
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
519 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
520 if (content_range == NULL) {
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
521 return NGX_ERROR;
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
522 }
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
523
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
524 r->headers_out.content_range = content_range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
525
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
526 content_range->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3331
diff changeset
527 ngx_str_set(&content_range->key, "Content-Range");
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
528
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
529 content_range->value.data = ngx_pnalloc(r->pool,
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
530 sizeof("bytes */") - 1 + NGX_OFF_T_LEN);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
531 if (content_range->value.data == NULL) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
532 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
533 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
534
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
535 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
536 "bytes */%O",
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
537 r->headers_out.content_length_n)
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
538 - content_range->value.data;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
539
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
540 ngx_http_clear_content_length(r);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
541
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
542 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
543 }
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
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
546 static ngx_int_t
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
547 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
548 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
549 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
550
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
551 if (in == NULL) {
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
552 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
553 }
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
554
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
555 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
556
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
557 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
558 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
559 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
560
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
561 if (ctx->ranges.nelts == 1) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
562 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
563 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
564
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
565 /*
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
566 * 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
567 */
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
568
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
569 if (ngx_buf_special(in->buf)) {
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
570 return ngx_http_next_body_filter(r, in);
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
571 }
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
572
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
573 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
574 return NGX_ERROR;
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 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
578 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
579
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 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
582 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
583 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
584 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
585 off_t start, last;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
586 ngx_buf_t *buf;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
587 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
588 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
589
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
590 if (ctx->offset) {
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
591 goto overlapped;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
592 }
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
593
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
594 buf = in->buf;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
595
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
596 if (!buf->last_buf) {
962
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 if (buf->in_file) {
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
599 start = buf->file_pos + ctx->offset;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
600 last = buf->file_last + 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 } else {
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
603 start = buf->pos - buf->start + ctx->offset;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
604 last = buf->last - buf->start + ctx->offset;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
605 }
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
606
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
607 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
608 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
609 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
610 goto overlapped;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
611 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
612 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
613 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
614
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
615 ctx->offset = ngx_buf_size(buf);
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
616
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
617 return NGX_OK;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
618
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
619 overlapped:
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
620
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
621 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
622 "range in overlapped buffers");
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
623
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
624 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
625 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
626
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
627
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
628 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
629 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
630 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
631 {
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
632 off_t start, last;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
633 ngx_buf_t *buf;
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
634 ngx_chain_t *out, *cl, **ll;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
635 ngx_http_range_t *range;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
636
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
637 out = NULL;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
638 ll = &out;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
639 range = ctx->ranges.elts;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
640
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
641 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
642
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
643 buf = cl->buf;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
644
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
645 start = ctx->offset;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
646 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
647
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
648 ctx->offset = last;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
649
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
650 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
651 "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
652
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
653 if (ngx_buf_special(buf)) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
654 *ll = cl;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
655 ll = &cl->next;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
656 continue;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
657 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
658
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
659 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
660
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
661 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
662 "http range body skip");
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
663
2269
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
664 if (buf->in_file) {
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
665 buf->file_pos = buf->file_last;
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
666 }
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
667
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
668 buf->pos = buf->last;
2269
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
669 buf->sync = 1;
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
670
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
671 continue;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
672 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
673
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
674 if (range->start > start) {
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 (buf->in_file) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
677 buf->file_pos += 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 if (ngx_buf_in_memory(buf)) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
681 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
682 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
683 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
684
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
685 if (range->end <= last) {
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 (buf->in_file) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
688 buf->file_last -= 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 if (ngx_buf_in_memory(buf)) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
692 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
693 }
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 buf->last_buf = 1;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
696 *ll = cl;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
697 cl->next = NULL;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
698
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
699 break;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
700 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
701
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
702 *ll = cl;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
703 ll = &cl->next;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
704 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
705
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
706 if (out == NULL) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
707 return NGX_OK;
2118
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
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
710 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
711 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
712
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
713
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
714 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
715 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
716 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
717 {
2592
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
718 off_t body_start;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
719 ngx_buf_t *b, *buf;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
720 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
721 ngx_chain_t *out, *hcl, *rcl, *dcl, **ll;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
722 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
723
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
724 ll = &out;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
725 buf = in->buf;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
726 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
727
2592
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
728 #if (NGX_HTTP_CACHE)
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
729 body_start = r->cached ? r->cache->body_start : 0;
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
730 #else
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
731 body_start = 0;
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
732 #endif
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
733
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
734 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
735
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
736 /*
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
737 * The boundary header of the range:
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
738 * CRLF
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
739 * "--0123456789" CRLF
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
740 * "Content-Type: image/jpeg" CRLF
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
741 * "Content-Range: bytes "
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
742 */
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
743
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
744 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
745 if (b == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
746 return NGX_ERROR;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
747 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
748
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
749 b->memory = 1;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
750 b->pos = ctx->boundary_header.data;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
751 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
752
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
753 hcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
754 if (hcl == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
755 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
756 }
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
757
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
758 hcl->buf = b;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
759
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
760
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
761 /* "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
762
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
763 b = ngx_calloc_buf(r->pool);
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
764 if (b == NULL) {
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
765 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
766 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
767
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
768 b->temporary = 1;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
769 b->pos = range[i].content_range.data;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
770 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
771
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
772 rcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
773 if (rcl == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
774 return NGX_ERROR;
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
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
777 rcl->buf = b;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
778
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
779
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
780 /* the range data */
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
781
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
782 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
783 if (b == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
784 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
785 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
786
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
787 b->in_file = buf->in_file;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
788 b->temporary = buf->temporary;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
789 b->memory = buf->memory;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
790 b->mmap = buf->mmap;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
791 b->file = buf->file;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
792
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
793 if (buf->in_file) {
2592
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
794 b->file_pos = body_start + range[i].start;
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
795 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
796 }
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 if (ngx_buf_in_memory(buf)) {
1093
d0fb2cc2a098 fix several ranges
Igor Sysoev <igor@sysoev.ru>
parents: 963
diff changeset
799 b->pos = buf->start + (size_t) range[i].start;
d0fb2cc2a098 fix several ranges
Igor Sysoev <igor@sysoev.ru>
parents: 963
diff changeset
800 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
801 }
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
802
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
803 dcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
804 if (dcl == NULL) {
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
805 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
806 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
807
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
808 dcl->buf = b;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
809
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
810 *ll = hcl;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
811 hcl->next = rcl;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
812 rcl->next = dcl;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
813 ll = &dcl->next;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
814 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
815
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
816 /* the last boundary CRLF "--0123456789--" CRLF */
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 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
819 if (b == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
820 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
821 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
822
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
823 b->temporary = 1;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
824 b->last_buf = 1;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
825
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
826 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
827 + sizeof("--" CRLF) - 1);
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
828 if (b->pos == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
829 return NGX_ERROR;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
830 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
831
1195
4ba6df5d5b53 fix multipart ranges trailing
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
832 b->last = ngx_cpymem(b->pos, ctx->boundary_header.data,
4ba6df5d5b53 fix multipart ranges trailing
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
833 sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN);
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
834 *b->last++ = '-'; *b->last++ = '-';
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
835 *b->last++ = CR; *b->last++ = LF;
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 hcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
838 if (hcl == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
839 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
840 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
841
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
842 hcl->buf = b;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
843 hcl->next = NULL;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
844
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
845 *ll = hcl;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
846
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
847 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
848 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
849
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
850
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
851 static ngx_int_t
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
852 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
853 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
854 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
855 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
856
334
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
857 return NGX_OK;
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
858 }
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
859
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
860
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
861 static ngx_int_t
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
862 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
863 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
864 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
865 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
866
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
867 return NGX_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
868 }