Mercurial > hg > nginx

annotate src/http/modules/ngx_http_range_filter_module.c @ 5558:eeb3c2719147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Range filter: fixed duplicate charset. If a proxied response had charset in Content-Type, the charset was duplicated in a response to client request with byte ranges.
author Ruslan Ermilov <ru@nginx.com>
date Tue, 04 Feb 2014 17:13:35 +0400
parents a387ce36744a
children 345e4fd4bb64
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
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 4063
diff changeset
4 * Copyright (C) Nginx, Inc.
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
5 */
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
6
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
8 #include <ngx_config.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
9 #include <ngx_core.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
10 #include <ngx_http.h>
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
11
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
12
160
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
13 /*
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
14 * 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
15 *
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
16 * "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
17 * ... header ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
18 * "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
19 * "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
20 * "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
21 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
22 * ... data ...
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 *
5538
a387ce36744a Typo fixed.
Tatsuhiko Kubo <cubicdaiya@gmail.com>
parents: 4750
diff changeset
25 * the multipart format:
160
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
26 *
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
27 * "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
28 * ... header ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
29 * "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
30 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
31 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
32 * "--0123456789" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
33 * "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
34 * "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
35 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
36 * ... data ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
37 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
38 * "--0123456789" CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
39 * "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
40 * "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
41 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
42 * ... data ...
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
43 * CRLF
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
44 * "--0123456789--" CRLF
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
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
47
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
48 typedef struct {
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
49 off_t start;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
50 off_t end;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
51 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
52 } ngx_http_range_t;
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
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
55 typedef struct {
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
56 off_t offset;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
57 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
58 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
59 } 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
60
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
61
4058
d32a2000b766 ngx_http_range_parse() should be static.
Igor Sysoev <igor@sysoev.ru>
parents: 4057
diff changeset
62 static ngx_int_t ngx_http_range_parse(ngx_http_request_t *r,
4062
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
63 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
64 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
65 ngx_http_range_filter_ctx_t *ctx);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
66 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
67 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
68 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
69 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
70 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
71 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
72 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
73 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
74 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
75
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
76 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
77 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
78
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
79
334
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
80 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
81 NULL, /* preconfiguration */
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
82 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
83
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
84 NULL, /* create main configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
85 NULL, /* init main configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
86
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
87 NULL, /* create server configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
88 NULL, /* merge server configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
89
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
90 NULL, /* create location configuration */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
91 NULL, /* merge location configuration */
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
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
94
334
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
95 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
96 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
97 &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
98 NULL, /* module directives */
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
99 NGX_HTTP_MODULE, /* module type */
541
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
100 NULL, /* init master */
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
101 NULL, /* init module */
541
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
102 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
103 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
104 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
105 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
106 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
107 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
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
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
111 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
112 NULL, /* preconfiguration */
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
113 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
114
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
115 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
116 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
117
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
118 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
119 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
120
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
121 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
122 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
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
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
126 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
127 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
128 &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
129 NULL, /* module directives */
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
130 NGX_HTTP_MODULE, /* module type */
541
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
131 NULL, /* init master */
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
132 NULL, /* init module */
541
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
133 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
134 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
135 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
136 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
137 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
138 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
139 };
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
140
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
141
155
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_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
143 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
144
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
145
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
146 static ngx_int_t
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
147 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
148 {
4745
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
149 time_t if_range_time;
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
150 ngx_str_t *if_range, *etag;
4062
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
151 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
152 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
153
160
e7e094d34162 nginx-0.0.1-2003-10-27-11:53:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
154 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
155 || 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
156 || 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
157 || r->headers_out.content_length_n == -1
581
326634fb9d47 nginx-0.3.12-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
158 || !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
159 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
160 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
161 }
f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
162
4062
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
163 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
164
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
165 if (clcf->max_ranges == 0) {
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
166 return ngx_http_next_header_filter(r);
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
167 }
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
168
117
f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
169 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
170 || r->headers_in.range->value.len < 7
1107
db7c468c447d ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents: 1093
diff changeset
171 || ngx_strncasecmp(r->headers_in.range->value.data,
db7c468c447d ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents: 1093
diff changeset
172 (u_char *) "bytes=", 6)
db7c468c447d ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents: 1093
diff changeset
173 != 0)
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
174 {
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
175 goto next_filter;
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
176 }
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
177
4741
5ea8c710c532 Fixed If-Range with unknown last modified time.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4467
diff changeset
178 if (r->headers_in.if_range) {
5ea8c710c532 Fixed If-Range with unknown last modified time.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4467
diff changeset
179
4745
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
180 if_range = &r->headers_in.if_range->value;
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
181
4750
149634c98d67 Entity tags: empty etags handling in If-Range.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4745
diff changeset
182 if (if_range->len >= 2 && if_range->data[if_range->len - 1] == '"') {
4745
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
183
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
184 if (r->headers_out.etag == NULL) {
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
185 goto next_filter;
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
186 }
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
187
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
188 etag = &r->headers_out.etag->value;
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
189
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
190 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
191 "http ir:%V etag:%V", if_range, etag);
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
192
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
193 if (if_range->len != etag->len
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
194 || ngx_strncmp(if_range->data, etag->data, etag->len) != 0)
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
195 {
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
196 goto next_filter;
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
197 }
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
198
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
199 goto parse;
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
200 }
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
201
4741
5ea8c710c532 Fixed If-Range with unknown last modified time.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4467
diff changeset
202 if (r->headers_out.last_modified_time == (time_t) -1) {
5ea8c710c532 Fixed If-Range with unknown last modified time.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4467
diff changeset
203 goto next_filter;
5ea8c710c532 Fixed If-Range with unknown last modified time.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4467
diff changeset
204 }
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
205
4745
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
206 if_range_time = ngx_http_parse_time(if_range->data, if_range->len);
117
f6e3c5d019b6 nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents: 113
diff changeset
207
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
208 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
209 "http ir:%d lm:%d",
4745
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
210 if_range_time, 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
211
4745
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
212 if (if_range_time != r->headers_out.last_modified_time) {
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
213 goto next_filter;
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
214 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
215 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
216
4745
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
217 parse:
4752060ca462 Entity tags: support in If-Range header.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4741
diff changeset
218
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
219 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
220 if (ctx == NULL) {
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
221 return NGX_ERROR;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
222 }
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
223
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
224 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
225 != NGX_OK)
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
226 {
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
227 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
228 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
229
4062
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
230 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
231
4035
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
232 case NGX_OK:
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
233 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
234
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
235 r->headers_out.status = NGX_HTTP_PARTIAL_CONTENT;
2592
3a8a53c0c42f a prelimiary proxy cache support
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
236 r->headers_out.status_line.len = 0;
2118
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 if (ctx->ranges.nelts == 1) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
239 return ngx_http_range_singlepart_header(r, ctx);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
240 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
241
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
242 return ngx_http_range_multipart_header(r, ctx);
4035
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
243
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
244 case NGX_HTTP_RANGE_NOT_SATISFIABLE:
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
245 return ngx_http_range_not_satisfiable(r);
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
246
4035
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
247 case NGX_ERROR:
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
248 return NGX_ERROR;
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
249
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
250 default: /* NGX_DECLINED */
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
251 break;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
252 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
253
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
254 next_filter:
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
255
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
256 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
257 if (r->headers_out.accept_ranges == NULL) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
258 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
259 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
260
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
261 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
262 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
263 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
264
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
265 return ngx_http_next_header_filter(r);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
266 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
267
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
268
4058
d32a2000b766 ngx_http_range_parse() should be static.
Igor Sysoev <igor@sysoev.ru>
parents: 4057
diff changeset
269 static ngx_int_t
4062
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
270 ngx_http_range_parse(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx,
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
271 ngx_uint_t ranges)
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
272 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
273 u_char *p;
4057
3205a6d6c6ec Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4056
diff changeset
274 off_t start, end, size, content_length;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
275 ngx_uint_t suffix;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
276 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
277
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
278 p = r->headers_in.range->value.data + 6;
4035
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
279 size = 0;
4057
3205a6d6c6ec Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4056
diff changeset
280 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
281
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
282 for ( ;; ) {
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
283 start = 0;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
284 end = 0;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
285 suffix = 0;
99
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 while (*p == ' ') { p++; }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
288
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
289 if (*p != '-') {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
290 if (*p < '0' || *p > '9') {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
291 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
292 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
293
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
294 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
295 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
296 }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
297
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
298 while (*p == ' ') { p++; }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
299
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
300 if (*p++ != '-') {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
301 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
302 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
303
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
304 while (*p == ' ') { p++; }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
305
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
306 if (*p == ',' || *p == '\0') {
4057
3205a6d6c6ec Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4056
diff changeset
307 end = content_length;
4055
9cce506be97d Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4054
diff changeset
308 goto found;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
309 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
310
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
311 } else {
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
312 suffix = 1;
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
313 p++;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
314 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
315
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
316 if (*p < '0' || *p > '9') {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
317 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
318 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
319
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
320 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
321 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
322 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
323
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
324 while (*p == ' ') { p++; }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
325
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
326 if (*p != ',' && *p != '\0') {
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
327 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
328 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
329
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
330 if (suffix) {
4057
3205a6d6c6ec Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4056
diff changeset
331 start = content_length - end;
3205a6d6c6ec Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4056
diff changeset
332 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
333 }
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
334
4057
3205a6d6c6ec Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4056
diff changeset
335 if (end >= content_length) {
3205a6d6c6ec Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4056
diff changeset
336 end = content_length;
4055
9cce506be97d Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4054
diff changeset
337
9cce506be97d Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4054
diff changeset
338 } else {
9cce506be97d Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4054
diff changeset
339 end++;
9cce506be97d Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4054
diff changeset
340 }
9cce506be97d Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4054
diff changeset
341
9cce506be97d Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4054
diff changeset
342 found:
9cce506be97d Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4054
diff changeset
343
4060
45de8d258085 *) fix of r4060: start value should be tested after the "found" label;
Igor Sysoev <igor@sysoev.ru>
parents: 4059
diff changeset
344 if (start < end) {
4061
bd2ec6ce5d58 Style fix: removal of tabs introduced in the previous commit.
Igor Sysoev <igor@sysoev.ru>
parents: 4060
diff changeset
345 range = ngx_array_push(&ctx->ranges);
bd2ec6ce5d58 Style fix: removal of tabs introduced in the previous commit.
Igor Sysoev <igor@sysoev.ru>
parents: 4060
diff changeset
346 if (range == NULL) {
bd2ec6ce5d58 Style fix: removal of tabs introduced in the previous commit.
Igor Sysoev <igor@sysoev.ru>
parents: 4060
diff changeset
347 return NGX_ERROR;
bd2ec6ce5d58 Style fix: removal of tabs introduced in the previous commit.
Igor Sysoev <igor@sysoev.ru>
parents: 4060
diff changeset
348 }
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
349
4061
bd2ec6ce5d58 Style fix: removal of tabs introduced in the previous commit.
Igor Sysoev <igor@sysoev.ru>
parents: 4060
diff changeset
350 range->start = start;
bd2ec6ce5d58 Style fix: removal of tabs introduced in the previous commit.
Igor Sysoev <igor@sysoev.ru>
parents: 4060
diff changeset
351 range->end = end;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
352
4061
bd2ec6ce5d58 Style fix: removal of tabs introduced in the previous commit.
Igor Sysoev <igor@sysoev.ru>
parents: 4060
diff changeset
353 size += end - start;
4062
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
354
4063
8d70904b6c48 Now if client requests more ranges than "max_ranges" permits,
Igor Sysoev <igor@sysoev.ru>
parents: 4062
diff changeset
355 if (ranges-- == 0) {
8d70904b6c48 Now if client requests more ranges than "max_ranges" permits,
Igor Sysoev <igor@sysoev.ru>
parents: 4062
diff changeset
356 return NGX_DECLINED;
4062
82738a316a54 The "max_ranges" directive.
Igor Sysoev <igor@sysoev.ru>
parents: 4061
diff changeset
357 }
4060
45de8d258085 *) fix of r4060: start value should be tested after the "found" label;
Igor Sysoev <igor@sysoev.ru>
parents: 4059
diff changeset
358 }
4056
e9213133993a Now unsatisfiable ranges are processed according to RFC 2616.
Igor Sysoev <igor@sysoev.ru>
parents: 4055
diff changeset
359
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
360 if (*p++ != ',') {
4035
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
361 break;
231
92db0aa1e83f nginx-0.0.1-2004-01-16-21:29:15 import
Igor Sysoev <igor@sysoev.ru>
parents: 195
diff changeset
362 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
363 }
4035
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
364
4056
e9213133993a Now unsatisfiable ranges are processed according to RFC 2616.
Igor Sysoev <igor@sysoev.ru>
parents: 4055
diff changeset
365 if (ctx->ranges.nelts == 0) {
e9213133993a Now unsatisfiable ranges are processed according to RFC 2616.
Igor Sysoev <igor@sysoev.ru>
parents: 4055
diff changeset
366 return NGX_HTTP_RANGE_NOT_SATISFIABLE;
e9213133993a Now unsatisfiable ranges are processed according to RFC 2616.
Igor Sysoev <igor@sysoev.ru>
parents: 4055
diff changeset
367 }
e9213133993a Now unsatisfiable ranges are processed according to RFC 2616.
Igor Sysoev <igor@sysoev.ru>
parents: 4055
diff changeset
368
4057
3205a6d6c6ec Ranges processing small optimization.
Igor Sysoev <igor@sysoev.ru>
parents: 4056
diff changeset
369 if (size > content_length) {
4035
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
370 return NGX_DECLINED;
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
371 }
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
372
c2a91088b0c0 Now if total size of all ranges is greater than source response size,
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
373 return NGX_OK;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
374 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
375
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
376
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
377 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
378 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
379 ngx_http_range_filter_ctx_t *ctx)
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
380 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
381 ngx_table_elt_t *content_range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
382 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
383
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
384 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
385 if (content_range == NULL) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
386 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
387 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
388
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
389 r->headers_out.content_range = content_range;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
390
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
391 content_range->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3331
diff changeset
392 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
393
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
394 content_range->value.data = ngx_pnalloc(r->pool,
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
395 sizeof("bytes -/") - 1 + 3 * NGX_OFF_T_LEN);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
396 if (content_range->value.data == NULL) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
397 return NGX_ERROR;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
398 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
399
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
400 /* "Content-Range: bytes SSSS-EEEE/TTTT" header */
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
401
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
402 range = ctx->ranges.elts;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
403
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
404 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
405 "bytes %O-%O/%O",
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
406 range->start, range->end - 1,
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
407 r->headers_out.content_length_n)
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
408 - content_range->value.data;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
409
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
410 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
411
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
412 if (r->headers_out.content_length) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
413 r->headers_out.content_length->hash = 0;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
414 r->headers_out.content_length = NULL;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
415 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
416
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
417 return ngx_http_next_header_filter(r);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
418 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
419
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
420
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
421 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
422 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
423 ngx_http_range_filter_ctx_t *ctx)
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
424 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
425 size_t len;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
426 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
427 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
428 ngx_atomic_uint_t boundary;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
429
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
430 len = sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
431 + sizeof(CRLF "Content-Type: ") - 1
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
432 + r->headers_out.content_type.len
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
433 + sizeof(CRLF "Content-Range: bytes ") - 1;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
434
5558
eeb3c2719147 Range filter: fixed duplicate charset.
Ruslan Ermilov <ru@nginx.com>
parents: 5538
diff changeset
435 if (r->headers_out.content_type_len == r->headers_out.content_type.len
eeb3c2719147 Range filter: fixed duplicate charset.
Ruslan Ermilov <ru@nginx.com>
parents: 5538
diff changeset
436 && r->headers_out.charset.len)
eeb3c2719147 Range filter: fixed duplicate charset.
Ruslan Ermilov <ru@nginx.com>
parents: 5538
diff changeset
437 {
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
438 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
439 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
440
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
441 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
442 if (ctx->boundary_header.data == NULL) {
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
443 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
444 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
445
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
446 boundary = ngx_next_temp_number(0);
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
447
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
448 /*
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
449 * The boundary header of the range:
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
450 * CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
451 * "--0123456789" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
452 * "Content-Type: image/jpeg" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
453 * "Content-Range: bytes "
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
454 */
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
455
5558
eeb3c2719147 Range filter: fixed duplicate charset.
Ruslan Ermilov <ru@nginx.com>
parents: 5538
diff changeset
456 if (r->headers_out.content_type_len == r->headers_out.content_type.len
eeb3c2719147 Range filter: fixed duplicate charset.
Ruslan Ermilov <ru@nginx.com>
parents: 5538
diff changeset
457 && r->headers_out.charset.len)
eeb3c2719147 Range filter: fixed duplicate charset.
Ruslan Ermilov <ru@nginx.com>
parents: 5538
diff changeset
458 {
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
459 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
460 CRLF "--%0muA" CRLF
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
461 "Content-Type: %V; charset=%V" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
462 "Content-Range: bytes ",
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
463 boundary,
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
464 &r->headers_out.content_type,
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
465 &r->headers_out.charset)
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
466 - ctx->boundary_header.data;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
467
2119
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
468 } 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
469 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
470 CRLF "--%0muA" CRLF
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
471 "Content-Type: %V" CRLF
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
472 "Content-Range: bytes ",
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
473 boundary,
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
474 &r->headers_out.content_type)
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
475 - ctx->boundary_header.data;
2119
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
476
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
477 } else {
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
478 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
479 CRLF "--%0muA" CRLF
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
480 "Content-Range: bytes ",
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
481 boundary)
0799703985ef fix ranges without Content-Type
Igor Sysoev <igor@sysoev.ru>
parents: 2118
diff changeset
482 - ctx->boundary_header.data;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
483 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
484
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
485 r->headers_out.content_type.data =
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
486 ngx_pnalloc(r->pool,
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
487 sizeof("Content-Type: multipart/byteranges; boundary=") - 1
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
488 + 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
489
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
490 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
491 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
492 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
493
2882
896db5a09bd2 reset content_type hash value, this fixes a bug when XSLT responses
Igor Sysoev <igor@sysoev.ru>
parents: 2592
diff changeset
494 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
495
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
496 /* "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
497
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
498 r->headers_out.content_type.len =
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
499 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
500 "multipart/byteranges; boundary=%0muA",
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
501 boundary)
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
502 - 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
503
2882
896db5a09bd2 reset content_type hash value, this fixes a bug when XSLT responses
Igor Sysoev <igor@sysoev.ru>
parents: 2592
diff changeset
504 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
505
5558
eeb3c2719147 Range filter: fixed duplicate charset.
Ruslan Ermilov <ru@nginx.com>
parents: 5538
diff changeset
506 r->headers_out.charset.len = 0;
eeb3c2719147 Range filter: fixed duplicate charset.
Ruslan Ermilov <ru@nginx.com>
parents: 5538
diff changeset
507
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
508 /* 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
509
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
510 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
511
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
512 range = ctx->ranges.elts;
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
513 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
514
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
515 /* 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
516
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
517 range[i].content_range.data =
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
518 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
519
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
520 if (range[i].content_range.data == NULL) {
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
521 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
522 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
523
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
524 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
525 "%O-%O/%O" CRLF CRLF,
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
526 range[i].start, range[i].end - 1,
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
527 r->headers_out.content_length_n)
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
528 - 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
529
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
530 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
531 + (size_t) (range[i].end - range[i].start);
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
532 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
533
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
534 r->headers_out.content_length_n = len;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
535
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
536 if (r->headers_out.content_length) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
537 r->headers_out.content_length->hash = 0;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
538 r->headers_out.content_length = NULL;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
539 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
540
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
541 return ngx_http_next_header_filter(r);
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
542 }
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
543
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
544
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
545 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
546 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
547 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
548 ngx_table_elt_t *content_range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
549
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
550 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
551
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
552 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
553 if (content_range == NULL) {
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
554 return NGX_ERROR;
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
555 }
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
556
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
557 r->headers_out.content_range = content_range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
558
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
559 content_range->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3331
diff changeset
560 ngx_str_set(&content_range->key, "Content-Range");
1630
9706372f8916 If-Range support
Igor Sysoev <igor@sysoev.ru>
parents: 1195
diff changeset
561
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
562 content_range->value.data = ngx_pnalloc(r->pool,
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
563 sizeof("bytes */") - 1 + NGX_OFF_T_LEN);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
564 if (content_range->value.data == NULL) {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
565 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
566 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
567
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
568 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
569 "bytes */%O",
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
570 r->headers_out.content_length_n)
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
571 - content_range->value.data;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
572
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
573 ngx_http_clear_content_length(r);
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
574
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
575 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
576 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
577
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
578
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
579 static ngx_int_t
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
580 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
581 {
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
582 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
583
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
584 if (in == NULL) {
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
585 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
586 }
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
587
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
588 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
589
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
590 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
591 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
592 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
593
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
594 if (ctx->ranges.nelts == 1) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
595 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
596 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
597
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
598 /*
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
599 * 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
600 */
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
601
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
602 if (ngx_buf_special(in->buf)) {
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
603 return ngx_http_next_body_filter(r, in);
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
604 }
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
605
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
606 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
607 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
608 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
609
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
610 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
611 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
612
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
613
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
614 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
615 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
616 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
617 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
618 off_t start, last;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
619 ngx_buf_t *buf;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
620 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
621 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
622
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
623 if (ctx->offset) {
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
624 goto overlapped;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
625 }
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
626
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
627 buf = in->buf;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
628
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
629 if (!buf->last_buf) {
4467
85a1570ce960 Removed r->cache/r->cached dependencies in range filter.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
630 start = ctx->offset;
85a1570ce960 Removed r->cache/r->cached dependencies in range filter.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
631 last = ctx->offset + ngx_buf_size(buf);
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
632
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
633 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
634 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
635 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
636 goto overlapped;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
637 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
638 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
639 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
640
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
641 ctx->offset = ngx_buf_size(buf);
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
642
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
643 return NGX_OK;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
644
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
645 overlapped:
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
646
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
647 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
648 "range in overlapped buffers");
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
649
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
650 return NGX_ERROR;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
651 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
652
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
653
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
654 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
655 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
656 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
657 {
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
658 off_t start, last;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
659 ngx_buf_t *buf;
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
660 ngx_chain_t *out, *cl, **ll;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
661 ngx_http_range_t *range;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
662
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
663 out = NULL;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
664 ll = &out;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
665 range = ctx->ranges.elts;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
666
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
667 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
668
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
669 buf = cl->buf;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
670
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
671 start = ctx->offset;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
672 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
673
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
674 ctx->offset = last;
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 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
677 "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
678
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
679 if (ngx_buf_special(buf)) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
680 *ll = cl;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
681 ll = &cl->next;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
682 continue;
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 <= start || range->start >= 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 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
688 "http range body skip");
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
689
2269
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
690 if (buf->in_file) {
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
691 buf->file_pos = buf->file_last;
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
692 }
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
693
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
694 buf->pos = buf->last;
2269
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
695 buf->sync = 1;
7155dbb2317e fix r2122:
Igor Sysoev <igor@sysoev.ru>
parents: 2121
diff changeset
696
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
697 continue;
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
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
700 if (range->start > start) {
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 if (buf->in_file) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
703 buf->file_pos += range->start - start;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
704 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
705
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
706 if (ngx_buf_in_memory(buf)) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
707 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
708 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
709 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
710
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
711 if (range->end <= last) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
712
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
713 if (buf->in_file) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
714 buf->file_last -= last - range->end;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
715 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
716
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
717 if (ngx_buf_in_memory(buf)) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
718 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
719 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
720
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
721 buf->last_buf = 1;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
722 *ll = cl;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
723 cl->next = NULL;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
724
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
725 break;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
726 }
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
727
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
728 *ll = cl;
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
729 ll = &cl->next;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
730 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
731
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
732 if (out == NULL) {
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
733 return NGX_OK;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
734 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
735
2121
b39c0040b3e4 support several buf's for single-part range
Igor Sysoev <igor@sysoev.ru>
parents: 2119
diff changeset
736 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
737 }
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
738
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
739
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
740 static ngx_int_t
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
741 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
742 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
743 {
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
744 ngx_buf_t *b, *buf;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
745 ngx_uint_t i;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
746 ngx_chain_t *out, *hcl, *rcl, *dcl, **ll;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
747 ngx_http_range_t *range;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
748
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
749 ll = &out;
2118
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
750 buf = in->buf;
c1f589732d8c split ngx_http_range_filter_module
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
751 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
752
963
78e70dae89f0 move ranges array to ngx_http_range_filter_ctx_t
Igor Sysoev <igor@sysoev.ru>
parents: 962
diff changeset
753 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
754
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
755 /*
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
756 * The boundary header of the range:
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
757 * CRLF
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
758 * "--0123456789" CRLF
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
759 * "Content-Type: image/jpeg" CRLF
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
760 * "Content-Range: bytes "
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
761 */
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
762
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
763 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
764 if (b == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
765 return NGX_ERROR;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
766 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
767
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
768 b->memory = 1;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
769 b->pos = ctx->boundary_header.data;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
770 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
771
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
772 hcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
773 if (hcl == 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 }
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
776
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
777 hcl->buf = b;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
778
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
779
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
780 /* "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
781
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
782 b = ngx_calloc_buf(r->pool);
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 499
diff changeset
783 if (b == NULL) {
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
784 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
785 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
786
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
787 b->temporary = 1;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
788 b->pos = range[i].content_range.data;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
789 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
790
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
791 rcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
792 if (rcl == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
793 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
794 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
795
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
796 rcl->buf = b;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
797
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
798
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
799 /* the range data */
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
800
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
801 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
802 if (b == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
803 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
804 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
805
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
806 b->in_file = buf->in_file;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
807 b->temporary = buf->temporary;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
808 b->memory = buf->memory;
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
809 b->mmap = buf->mmap;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
810 b->file = buf->file;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
811
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
812 if (buf->in_file) {
4467
85a1570ce960 Removed r->cache/r->cached dependencies in range filter.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
813 b->file_pos = buf->file_pos + range[i].start;
85a1570ce960 Removed r->cache/r->cached dependencies in range filter.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
814 b->file_last = buf->file_pos + range[i].end;
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
815 }
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
816
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
817 if (ngx_buf_in_memory(buf)) {
4467
85a1570ce960 Removed r->cache/r->cached dependencies in range filter.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
818 b->pos = buf->pos + (size_t) range[i].start;
85a1570ce960 Removed r->cache/r->cached dependencies in range filter.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
819 b->last = buf->pos + (size_t) range[i].end;
962
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
820 }
69754fb59ba1 support ranges for single memory buffer
Igor Sysoev <igor@sysoev.ru>
parents: 961
diff changeset
821
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
822 dcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
823 if (dcl == NULL) {
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
824 return NGX_ERROR;
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
825 }
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
826
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
827 dcl->buf = b;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
828
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
829 *ll = hcl;
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
830 hcl->next = rcl;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
831 rcl->next = dcl;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
832 ll = &dcl->next;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
833 }
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
834
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
835 /* the last boundary CRLF "--0123456789--" CRLF */
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 b = ngx_calloc_buf(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
838 if (b == 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 b->temporary = 1;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
843 b->last_buf = 1;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
844
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1630
diff changeset
845 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
846 + sizeof("--" CRLF) - 1);
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
847 if (b->pos == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
848 return NGX_ERROR;
99
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
1195
4ba6df5d5b53 fix multipart ranges trailing
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
851 b->last = ngx_cpymem(b->pos, ctx->boundary_header.data,
4ba6df5d5b53 fix multipart ranges trailing
Igor Sysoev <igor@sysoev.ru>
parents: 1107
diff changeset
852 sizeof(CRLF "--") - 1 + NGX_ATOMIC_T_LEN);
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
853 *b->last++ = '-'; *b->last++ = '-';
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
854 *b->last++ = CR; *b->last++ = LF;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
855
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
856 hcl = ngx_alloc_chain_link(r->pool);
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
857 if (hcl == NULL) {
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
858 return NGX_ERROR;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
859 }
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
860
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
861 hcl->buf = b;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
862 hcl->next = NULL;
99
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
863
960
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
864 *ll = hcl;
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
865
20279ed90b19 fix range in $r->sendfile
Igor Sysoev <igor@sysoev.ru>
parents: 959
diff changeset
866 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
867 }
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
868
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
869
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
870 static ngx_int_t
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
871 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
872 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
873 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
874 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
875
334
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
876 return NGX_OK;
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
877 }
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
878
af451db3fe99 nginx-0.0.3-2004-05-12-09:37:55 import
Igor Sysoev <igor@sysoev.ru>
parents: 314
diff changeset
879
493
975f62e77f02 nginx-0.1.21-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 467
diff changeset
880 static ngx_int_t
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 657
diff changeset
881 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
882 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 153
diff changeset
883 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
884 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
885
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
886 return NGX_OK;
a059e1aa65d4 nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
887 }