~ubuntu-branches/debian/squeeze/nginx/squeeze

« back to all changes in this revision

Viewing changes to src/http/ngx_http_write_filter_module.c

Committer: Bazaar Package Importer
Author(s): Fabio Tranchitella
Date: 2009-11-08 09:53:46 UTC
mfrom: (1.1.13 upstream)
Revision ID: james.westby@ubuntu.com-20091108095346-yt4eypw2l176tl53

Tags: 0.7.63-1

New upstream release.

files added:
auto/lib/geoip

auto/lib/geoip/conf

src/http/modules/ngx_http_geoip_module.c

files modified:
CHANGES

CHANGES.ru

auto/lib/conf

auto/modules

auto/options

auto/sources

debian/changelog

src/core/nginx.c

src/core/nginx.h

src/core/ngx_cycle.c

src/core/ngx_file.c

src/core/ngx_file.h

src/core/ngx_hash.c

src/core/ngx_output_chain.c

src/core/ngx_string.c

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_eventport_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_rtsig_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/http/modules/ngx_http_access_module.c

src/http/modules/ngx_http_addition_filter_module.c

src/http/modules/ngx_http_auth_basic_module.c

src/http/modules/ngx_http_autoindex_module.c

src/http/modules/ngx_http_browser_module.c

src/http/modules/ngx_http_charset_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_geo_module.c

src/http/modules/ngx_http_gzip_filter_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_limit_req_module.c

src/http/modules/ngx_http_limit_zone_module.c

src/http/modules/ngx_http_log_module.c

src/http/modules/ngx_http_map_module.c

src/http/modules/ngx_http_memcached_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_realip_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_secure_link_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_ssl_module.h

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/ngx_http_xslt_filter_module.c

src/http/modules/perl/nginx.pm

src/http/modules/perl/ngx_http_perl_module.c

src/http/ngx_http_cache.h

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_file_cache.c

src/http/ngx_http_parse.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_script.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_write_filter_module.c

src/mail/ngx_mail_auth_http_module.c

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_ssl_module.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.h

src/os/unix/ngx_process.c

src/os/unix/ngx_process.h

src/os/unix/ngx_process_cycle.c

src/os/unix/ngx_process_cycle.h

Show diffs side-by-side

added added

removed removed

src/http/ngx_http_write_filter_module.c

ngx_int_t

ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *in)

{

off_t size, sent, limit;

off_t size, sent, nsent, limit;

ngx_uint_t last, flush;

ngx_msec_t delay;

ngx_chain_t *cl, *ln, **ll, *chain;

210

}

211

212

if (r->limit_rate) {

213

limit = r->limit_rate * (ngx_time() - r->start_sec + 1) - c->sent;

213

limit = r->limit_rate * (ngx_time() - r->start_sec + 1)

214

- (c->sent - clcf->limit_rate_after);

214

215

216

if (limit <= 0) {

216

217

c->write->delayed = 1;

245

246

}

246

247

248

if (r->limit_rate) {

248

delay = (ngx_msec_t) ((c->sent - sent) * 1000 / r->limit_rate + 1);

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

265

delay = (ngx_msec_t) ((nsent - sent) * 1000 / r->limit_rate + 1);

249

266

250

267

if (delay > 0) {

251

268

c->write->delayed = 1;

Older »