comparison src/http/ngx_http_write_filter_module.c @ 635:18268abd340c release-0.3.39

nginx-0.3.39-RELEASE import *) Feature: the "uninitialized_variable_warn" directive; the logging level of the "uninitialized variable" message was lowered from "alert" to "warn". *) Feature: the "override_charset" directive. *) Change: now if the unknown variable is used in the "echo" and "if expr='$name'" SSI-commands, then the "unknown variable" message is not logged. *) Bugfix: the active connection counter increased on the exceeding of the connection limit specified by the "worker_connections" directive; the bug had appeared in 0.2.0. *) Bugfix: the limit rate might not work on some condition; the bug had appeared in 0.3.38.
author Igor Sysoev <igor@sysoev.ru>
date Mon, 17 Apr 2006 19:55:41 +0000
parents f971949ffb58
children 9079ee4735ae
comparison
equal deleted inserted replaced
634:af8e20368022 635:18268abd340c
207 ngx_debug_point(); 207 ngx_debug_point();
208 208
209 return NGX_ERROR; 209 return NGX_ERROR;
210 } 210 }
211 211
212 to_send = r->limit_rate * (ngx_time() - r->start_time + 1) - c->sent; 212 if (r->limit_rate) {
213 213 to_send = r->limit_rate * (ngx_time() - r->start_time + 1) - c->sent;
214 if (to_send < 0) { 214
215 if (to_send <= 0) {
216 c->write->delayed = 1;
217 ngx_add_timer(r->connection->write,
218 (ngx_msec_t) (- to_send * 1000 / r->limit_rate));
219
220 c->buffered |= NGX_HTTP_WRITE_BUFFERED;
221
222 return NGX_AGAIN;
223 }
224
225 } else {
215 to_send = 0; 226 to_send = 0;
216 } 227 }
217 228
218 sent = c->sent; 229 sent = c->sent;
219 230