Mercurial > hg > nginx
annotate src/http/ngx_http_write_filter_module.c @ 5042:9be045b4a415 stable-1.2
Merge of r4962: limit_rate fix.
Limit rate: fixed integer overflow in limit calculation (ticket #256).
Patch by Alexey Antropov.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sun, 10 Feb 2013 03:20:00 +0000 |
| parents | a0f1d53546d4 |
| children | 06fbbde04098 |
| 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:
403
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:
403
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 | 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:
403
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:
403
diff
changeset
|
6 |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
|
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_config.h> |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
96
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:
96
diff
changeset
|
10 #include <ngx_http.h> |
|
43
53cd05892261
nginx-0.0.1-2002-12-27-19:22:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
42
diff
changeset
|
11 |
|
53cd05892261
nginx-0.0.1-2002-12-27-19:22:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
42
diff
changeset
|
12 |
| 681 | 13 static ngx_int_t ngx_http_write_filter_init(ngx_conf_t *cf); |
|
10
4f3879d9b6f6
nginx-0.0.1-2002-09-11-19:18:33 import
Igor Sysoev <igor@sysoev.ru>
parents:
9
diff
changeset
|
14 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
24
diff
changeset
|
15 |
| 667 | 16 static ngx_http_module_t ngx_http_write_filter_module_ctx = { |
| 509 | 17 NULL, /* preconfiguration */ |
| 681 | 18 ngx_http_write_filter_init, /* postconfiguration */ |
|
177
4db54fdbcbe7
nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents:
166
diff
changeset
|
19 |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
20 NULL, /* create main configuration */ |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
21 NULL, /* init main configuration */ |
|
69
e43f406e4525
nginx-0.0.1-2003-03-20-19:09:44 import
Igor Sysoev <igor@sysoev.ru>
parents:
67
diff
changeset
|
22 |
|
91
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
23 NULL, /* create server configuration */ |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
24 NULL, /* merge server configuration */ |
|
637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
90
diff
changeset
|
25 |
|
391
b670db10cbbd
nginx-0.0.7-2004-07-14-20:01:42 import
Igor Sysoev <igor@sysoev.ru>
parents:
363
diff
changeset
|
26 NULL, /* create location configuration */ |
|
b670db10cbbd
nginx-0.0.7-2004-07-14-20:01:42 import
Igor Sysoev <igor@sysoev.ru>
parents:
363
diff
changeset
|
27 NULL, /* merge location configuration */ |
|
10
4f3879d9b6f6
nginx-0.0.1-2002-09-11-19:18:33 import
Igor Sysoev <igor@sysoev.ru>
parents:
9
diff
changeset
|
28 }; |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
29 |
|
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
30 |
|
41
59e7c7f30d49
nginx-0.0.1-2002-12-26-19:26:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
31 ngx_module_t ngx_http_write_filter_module = { |
| 509 | 32 NGX_MODULE_V1, |
|
90
37530da31268
nginx-0.0.1-2003-05-16-19:27:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
83
diff
changeset
|
33 &ngx_http_write_filter_module_ctx, /* module context */ |
|
391
b670db10cbbd
nginx-0.0.7-2004-07-14-20:01:42 import
Igor Sysoev <igor@sysoev.ru>
parents:
363
diff
changeset
|
34 NULL, /* module directives */ |
|
96
a23d010f356d
nginx-0.0.1-2003-05-27-16:18:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
91
diff
changeset
|
35 NGX_HTTP_MODULE, /* module type */ |
| 541 | 36 NULL, /* init master */ |
| 681 | 37 NULL, /* init module */ |
| 541 | 38 NULL, /* init process */ |
| 39 NULL, /* init thread */ | |
| 40 NULL, /* exit thread */ | |
| 41 NULL, /* exit process */ | |
| 42 NULL, /* exit master */ | |
| 43 NGX_MODULE_V1_PADDING | |
|
41
59e7c7f30d49
nginx-0.0.1-2002-12-26-19:26:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
44 }; |
|
59e7c7f30d49
nginx-0.0.1-2002-12-26-19:26:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
45 |
|
59e7c7f30d49
nginx-0.0.1-2002-12-26-19:26:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
46 |
| 501 | 47 ngx_int_t |
| 48 ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in) | |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
49 { |
| 2907 | 50 off_t size, sent, nsent, limit; |
| 509 | 51 ngx_uint_t last, flush; |
|
1657
6a8a066adc98
improve throughput with large limit_rate
Igor Sysoev <igor@sysoev.ru>
parents:
1412
diff
changeset
|
52 ngx_msec_t delay; |
| 509 | 53 ngx_chain_t *cl, *ln, **ll, *chain; |
| 54 ngx_connection_t *c; | |
| 55 ngx_http_core_loc_conf_t *clcf; | |
|
9
6f58641241bb
nginx-0.0.1-2002-09-07-14:14:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
8
diff
changeset
|
56 |
| 527 | 57 c = r->connection; |
| 58 | |
| 583 | 59 if (c->error) { |
| 527 | 60 return NGX_ERROR; |
| 61 } | |
| 62 | |
|
303
00c5660d2707
nginx-0.0.3-2004-04-01-20:20:53 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
63 size = 0; |
|
00c5660d2707
nginx-0.0.3-2004-04-01-20:20:53 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
64 flush = 0; |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
65 last = 0; |
| 509 | 66 ll = &r->out; |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
67 |
|
155
46eb23d9471d
nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
154
diff
changeset
|
68 /* find the size, the flush point and the last link of the saved chain */ |
|
71
59229033ae93
nginx-0.0.1-2003-04-08-19:40:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
69 |
| 509 | 70 for (cl = r->out; cl; cl = cl->next) { |
|
155
46eb23d9471d
nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
154
diff
changeset
|
71 ll = &cl->next; |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
72 |
| 667 | 73 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0, |
| 479 | 74 "write old buf t:%d f:%d %p, pos %p, size: %z " |
| 75 "file: %O, size: %z", | |
| 76 cl->buf->temporary, cl->buf->in_file, | |
| 77 cl->buf->start, cl->buf->pos, | |
| 78 cl->buf->last - cl->buf->pos, | |
| 79 cl->buf->file_pos, | |
| 80 cl->buf->file_last - cl->buf->file_pos); | |
| 81 | |
| 461 | 82 #if 1 |
| 83 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { | |
| 667 | 84 ngx_log_error(NGX_LOG_ALERT, c->log, 0, |
| 483 | 85 "zero size buf in writer " |
| 86 "t:%d r:%d f:%d %p %p-%p %p %O-%O", | |
| 87 cl->buf->temporary, | |
| 88 cl->buf->recycled, | |
| 89 cl->buf->in_file, | |
| 90 cl->buf->start, | |
| 91 cl->buf->pos, | |
| 92 cl->buf->last, | |
| 93 cl->buf->file, | |
| 94 cl->buf->file_pos, | |
| 95 cl->buf->file_last); | |
| 96 | |
| 461 | 97 ngx_debug_point(); |
| 489 | 98 return NGX_ERROR; |
| 461 | 99 } |
| 100 #endif | |
| 101 | |
|
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:
333
diff
changeset
|
102 size += ngx_buf_size(cl->buf); |
|
3
34a521b1a148
nginx-0.0.1-2002-08-20-18:48:28 import
Igor Sysoev <igor@sysoev.ru>
parents:
1
diff
changeset
|
103 |
|
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:
333
diff
changeset
|
104 if (cl->buf->flush || cl->buf->recycled) { |
| 499 | 105 flush = 1; |
|
41
59e7c7f30d49
nginx-0.0.1-2002-12-26-19:26:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
106 } |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
107 |
|
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:
333
diff
changeset
|
108 if (cl->buf->last_buf) { |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
109 last = 1; |
|
41
59e7c7f30d49
nginx-0.0.1-2002-12-26-19:26:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
110 } |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
111 } |
|
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
112 |
|
153
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
113 /* add the new chain to the existent one */ |
|
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
114 |
|
332
159dd60d257a
nginx-0.0.3-2004-05-10-23:53:35 import
Igor Sysoev <igor@sysoev.ru>
parents:
319
diff
changeset
|
115 for (ln = in; ln; ln = ln->next) { |
| 501 | 116 cl = ngx_alloc_chain_link(r->pool); |
| 117 if (cl == NULL) { | |
| 461 | 118 return NGX_ERROR; |
| 119 } | |
| 120 | |
| 121 cl->buf = ln->buf; | |
|
155
46eb23d9471d
nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
154
diff
changeset
|
122 *ll = cl; |
|
46eb23d9471d
nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
154
diff
changeset
|
123 ll = &cl->next; |
|
153
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
124 |
| 667 | 125 ngx_log_debug7(NGX_LOG_DEBUG_EVENT, c->log, 0, |
| 479 | 126 "write new buf t:%d f:%d %p, pos %p, size: %z " |
| 127 "file: %O, size: %z", | |
| 128 cl->buf->temporary, cl->buf->in_file, | |
| 129 cl->buf->start, cl->buf->pos, | |
| 130 cl->buf->last - cl->buf->pos, | |
| 131 cl->buf->file_pos, | |
| 132 cl->buf->file_last - cl->buf->file_pos); | |
| 133 | |
| 461 | 134 #if 1 |
| 135 if (ngx_buf_size(cl->buf) == 0 && !ngx_buf_special(cl->buf)) { | |
| 667 | 136 ngx_log_error(NGX_LOG_ALERT, c->log, 0, |
| 483 | 137 "zero size buf in writer " |
| 138 "t:%d r:%d f:%d %p %p-%p %p %O-%O", | |
| 139 cl->buf->temporary, | |
| 140 cl->buf->recycled, | |
| 141 cl->buf->in_file, | |
| 142 cl->buf->start, | |
| 143 cl->buf->pos, | |
| 144 cl->buf->last, | |
| 145 cl->buf->file, | |
| 146 cl->buf->file_pos, | |
| 147 cl->buf->file_last); | |
| 148 | |
| 461 | 149 ngx_debug_point(); |
| 489 | 150 return NGX_ERROR; |
| 461 | 151 } |
| 152 #endif | |
| 153 | |
|
403
ea3113b181d1
nginx-0.0.9-2004-07-28-23:21:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
402
diff
changeset
|
154 size += ngx_buf_size(cl->buf); |
|
153
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
155 |
|
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:
333
diff
changeset
|
156 if (cl->buf->flush || cl->buf->recycled) { |
| 499 | 157 flush = 1; |
|
153
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
158 } |
|
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
159 |
|
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:
333
diff
changeset
|
160 if (cl->buf->last_buf) { |
|
153
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
161 last = 1; |
|
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
162 } |
|
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
163 } |
|
c71aeb75c071
nginx-0.0.1-2003-10-21-20:49:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
164 |
| 461 | 165 *ll = NULL; |
| 166 | |
|
396
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
395
diff
changeset
|
167 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 499 | 168 "http write filter: l:%d f:%d s:%O", last, flush, size); |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
24
diff
changeset
|
169 |
| 509 | 170 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
|
154
eac26585476e
nginx-0.0.1-2003-10-22-11:05:29 import
Igor Sysoev <igor@sysoev.ru>
parents:
153
diff
changeset
|
171 |
|
142
cb77c084acdb
nginx-0.0.1-2003-10-09-11:00:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
172 /* |
| 509 | 173 * avoid the output if there are no last buf, no flush point, |
|
344
e366ba5db8f8
nginx-0.0.3-2004-06-01-10:04:46 import
Igor Sysoev <igor@sysoev.ru>
parents:
343
diff
changeset
|
174 * there are the incoming bufs and the size of all bufs |
|
332
159dd60d257a
nginx-0.0.3-2004-05-10-23:53:35 import
Igor Sysoev <igor@sysoev.ru>
parents:
319
diff
changeset
|
175 * is smaller than "postpone_output" directive |
|
142
cb77c084acdb
nginx-0.0.1-2003-10-09-11:00:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
176 */ |
|
71
59229033ae93
nginx-0.0.1-2003-04-08-19:40:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
177 |
| 499 | 178 if (!last && !flush && in && size < (off_t) clcf->postpone_output) { |
|
4
c5f071d376e5
nginx-0.0.1-2002-08-22-19:24:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
3
diff
changeset
|
179 return NGX_OK; |
|
41
59e7c7f30d49
nginx-0.0.1-2002-12-26-19:26:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
180 } |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
181 |
|
396
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
395
diff
changeset
|
182 if (c->write->delayed) { |
| 597 | 183 c->buffered |= NGX_HTTP_WRITE_BUFFERED; |
|
77
57c2e18d3572
nginx-0.0.1-2003-04-17-21:59:35 import
Igor Sysoev <igor@sysoev.ru>
parents:
75
diff
changeset
|
184 return NGX_AGAIN; |
|
57c2e18d3572
nginx-0.0.1-2003-04-17-21:59:35 import
Igor Sysoev <igor@sysoev.ru>
parents:
75
diff
changeset
|
185 } |
|
57c2e18d3572
nginx-0.0.1-2003-04-17-21:59:35 import
Igor Sysoev <igor@sysoev.ru>
parents:
75
diff
changeset
|
186 |
| 597 | 187 if (size == 0 && !(c->buffered & NGX_LOWLEVEL_BUFFERED)) { |
|
4848
a0f1d53546d4
Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
188 if (last || flush) { |
|
a0f1d53546d4
Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
189 for (cl = r->out; cl; /* void */) { |
|
a0f1d53546d4
Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
190 ln = cl; |
|
a0f1d53546d4
Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
191 cl = cl->next; |
|
a0f1d53546d4
Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
192 ngx_free_chain(r->pool, ln); |
|
a0f1d53546d4
Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
193 } |
| 597 | 194 |
|
4848
a0f1d53546d4
Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
195 r->out = NULL; |
| 597 | 196 c->buffered &= ~NGX_HTTP_WRITE_BUFFERED; |
| 501 | 197 |
| 499 | 198 return NGX_OK; |
| 199 } | |
| 200 | |
| 667 | 201 ngx_log_error(NGX_LOG_ALERT, c->log, 0, |
| 483 | 202 "the http output chain is empty"); |
| 461 | 203 |
| 483 | 204 ngx_debug_point(); |
| 205 | |
| 206 return NGX_ERROR; | |
|
143
5526213be452
nginx-0.0.1-2003-10-10-19:10:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
142
diff
changeset
|
207 } |
|
5526213be452
nginx-0.0.1-2003-10-10-19:10:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
142
diff
changeset
|
208 |
| 635 | 209 if (r->limit_rate) { |
|
5042
9be045b4a415
Merge of r4962: limit_rate fix.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4848
diff
changeset
|
210 limit = (off_t) r->limit_rate * (ngx_time() - r->start_sec + 1) |
| 2907 | 211 - (c->sent - clcf->limit_rate_after); |
| 633 | 212 |
|
1194
8ea6caa62c89
style fix: change variable name
Igor Sysoev <igor@sysoev.ru>
parents:
1179
diff
changeset
|
213 if (limit <= 0) { |
| 635 | 214 c->write->delayed = 1; |
| 667 | 215 ngx_add_timer(c->write, |
|
1194
8ea6caa62c89
style fix: change variable name
Igor Sysoev <igor@sysoev.ru>
parents:
1179
diff
changeset
|
216 (ngx_msec_t) (- limit * 1000 / r->limit_rate + 1)); |
| 635 | 217 |
| 218 c->buffered |= NGX_HTTP_WRITE_BUFFERED; | |
| 219 | |
| 220 return NGX_AGAIN; | |
| 221 } | |
| 222 | |
|
4384
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
223 if (clcf->sendfile_max_chunk |
|
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
224 && (off_t) clcf->sendfile_max_chunk < limit) |
|
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
225 { |
|
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
226 limit = clcf->sendfile_max_chunk; |
|
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
227 } |
| 1197 | 228 |
| 635 | 229 } else { |
|
4384
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
230 limit = clcf->sendfile_max_chunk; |
| 633 | 231 } |
| 232 | |
|
396
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
395
diff
changeset
|
233 sent = c->sent; |
|
361
446782c909b3
nginx-0.0.7-2004-06-20-23:54:15 import
Igor Sysoev <igor@sysoev.ru>
parents:
356
diff
changeset
|
234 |
| 633 | 235 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
|
1194
8ea6caa62c89
style fix: change variable name
Igor Sysoev <igor@sysoev.ru>
parents:
1179
diff
changeset
|
236 "http write filter limit %O", limit); |
| 633 | 237 |
|
1194
8ea6caa62c89
style fix: change variable name
Igor Sysoev <igor@sysoev.ru>
parents:
1179
diff
changeset
|
238 chain = c->send_chain(c, r->out, limit); |
|
61
4f3e2abcc2c4
nginx-0.0.1-2003-02-11-19:42:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
59
diff
changeset
|
239 |
|
396
6f3b20c1ac50
nginx-0.0.7-2004-07-18-23:11:20 import
Igor Sysoev <igor@sysoev.ru>
parents:
395
diff
changeset
|
240 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, |
| 461 | 241 "http write filter %p", chain); |
|
61
4f3e2abcc2c4
nginx-0.0.1-2003-02-11-19:42:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
59
diff
changeset
|
242 |
| 633 | 243 if (chain == NGX_CHAIN_ERROR) { |
| 244 c->error = 1; | |
| 245 return NGX_ERROR; | |
| 246 } | |
| 247 | |
| 1197 | 248 if (r->limit_rate) { |
| 2907 | 249 |
| 250 nsent = c->sent; | |
| 251 | |
| 252 if (clcf->limit_rate_after) { | |
| 253 | |
| 254 sent -= clcf->limit_rate_after; | |
| 255 if (sent < 0) { | |
| 256 sent = 0; | |
| 257 } | |
| 258 | |
| 259 nsent -= clcf->limit_rate_after; | |
| 260 if (nsent < 0) { | |
| 261 nsent = 0; | |
| 262 } | |
| 263 } | |
| 264 | |
|
4383
5130c16a130e
Fixed throughput problems with large limit_rate.
Maxim Dounin <mdounin@mdounin.ru>
parents:
2907
diff
changeset
|
265 delay = (ngx_msec_t) ((nsent - sent) * 1000 / r->limit_rate); |
|
1657
6a8a066adc98
improve throughput with large limit_rate
Igor Sysoev <igor@sysoev.ru>
parents:
1412
diff
changeset
|
266 |
|
6a8a066adc98
improve throughput with large limit_rate
Igor Sysoev <igor@sysoev.ru>
parents:
1412
diff
changeset
|
267 if (delay > 0) { |
|
4384
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
268 limit = 0; |
|
1657
6a8a066adc98
improve throughput with large limit_rate
Igor Sysoev <igor@sysoev.ru>
parents:
1412
diff
changeset
|
269 c->write->delayed = 1; |
|
6a8a066adc98
improve throughput with large limit_rate
Igor Sysoev <igor@sysoev.ru>
parents:
1412
diff
changeset
|
270 ngx_add_timer(c->write, delay); |
|
6a8a066adc98
improve throughput with large limit_rate
Igor Sysoev <igor@sysoev.ru>
parents:
1412
diff
changeset
|
271 } |
|
4384
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
272 } |
| 1197 | 273 |
|
4384
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
274 if (limit |
|
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
275 && c->write->ready |
|
a8b6d5dee539
Fixed interaction of limit_rate and sendfile_max_chunk.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4383
diff
changeset
|
276 && c->sent - sent >= limit - (off_t) (2 * ngx_pagesize)) |
|
1408
e67ef50c3176
set delay only when almost whole sendfile_max_chunk was transferred
Igor Sysoev <igor@sysoev.ru>
parents:
1197
diff
changeset
|
277 { |
| 1197 | 278 c->write->delayed = 1; |
| 279 ngx_add_timer(c->write, 1); | |
|
362
7650aea1816f
nginx-0.0.7-2004-06-21-19:59:32 import
Igor Sysoev <igor@sysoev.ru>
parents:
361
diff
changeset
|
280 } |
|
361
446782c909b3
nginx-0.0.7-2004-06-20-23:54:15 import
Igor Sysoev <igor@sysoev.ru>
parents:
356
diff
changeset
|
281 |
| 509 | 282 for (cl = r->out; cl && cl != chain; /* void */) { |
| 507 | 283 ln = cl; |
| 284 cl = cl->next; | |
| 285 ngx_free_chain(r->pool, ln); | |
| 286 } | |
| 287 | |
| 509 | 288 r->out = chain; |
|
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
396
diff
changeset
|
289 |
| 597 | 290 if (chain) { |
| 291 c->buffered |= NGX_HTTP_WRITE_BUFFERED; | |
| 292 return NGX_AGAIN; | |
| 293 } | |
| 294 | |
| 295 c->buffered &= ~NGX_HTTP_WRITE_BUFFERED; | |
| 296 | |
| 297 if ((c->buffered & NGX_LOWLEVEL_BUFFERED) && r->postponed == NULL) { | |
|
395
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
298 return NGX_AGAIN; |
|
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
299 } |
|
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
300 |
|
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
396
diff
changeset
|
301 return NGX_OK; |
|
1
d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
302 } |
|
9
6f58641241bb
nginx-0.0.1-2002-09-07-14:14:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
8
diff
changeset
|
303 |
|
6f58641241bb
nginx-0.0.1-2002-09-07-14:14:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
8
diff
changeset
|
304 |
| 501 | 305 static ngx_int_t |
| 681 | 306 ngx_http_write_filter_init(ngx_conf_t *cf) |
|
71
59229033ae93
nginx-0.0.1-2003-04-08-19:40:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
307 { |
|
59229033ae93
nginx-0.0.1-2003-04-08-19:40:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
308 ngx_http_top_body_filter = ngx_http_write_filter; |
|
59229033ae93
nginx-0.0.1-2003-04-08-19:40:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
309 |
|
59229033ae93
nginx-0.0.1-2003-04-08-19:40:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
310 return NGX_OK; |
|
59229033ae93
nginx-0.0.1-2003-04-08-19:40:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
311 } |