Mercurial > hg > ngx_http_bytes_filter_module

comparison ngx_http_bytes_filter_module.c @ 5:be5e612dd602

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More readable calculations, no functional changes.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 03 Jul 2008 13:23:06 +0400
parents ab9f96327bb6
children 2e1eaf93e67e
comparison
equal deleted inserted replaced
4:ab9f96327bb6 5:be5e612dd602
415 b->file_pos, b->file_last); 415 b->file_pos, b->file_last);
416 416
417 if (range->start > ctx->offset) { 417 if (range->start > ctx->offset) {
418 b->file_pos += range->start - ctx->offset; 418 b->file_pos += range->start - ctx->offset;
419 } 419 }
420 if (range->end - ctx->offset < size) { 420 if (range->end < ctx->offset + size) {
421 b->file_last -= size - (range->end - ctx->offset); 421 b->file_last -= ctx->offset + size - range->end;
422 } 422 }
423 423
424 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 424 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
425 "bytes body filter: in file fixed, %O-%O", 425 "bytes body filter: in file fixed, %O-%O",
426 b->file_pos, b->file_last); 426 b->file_pos, b->file_last);
433 b->pos, b->last); 433 b->pos, b->last);
434 434
435 if (range->start > ctx->offset) { 435 if (range->start > ctx->offset) {
436 b->pos += (size_t) (range->start - ctx->offset); 436 b->pos += (size_t) (range->start - ctx->offset);
437 } 437 }
438 if (range->end - ctx->offset < size) { 438 if (range->end < ctx->offset + size) {
439 b->last -= (size_t) (size - (range->end - ctx->offset)); 439 b->last -= (size_t) (ctx->offset + size - range->end);
440 } 440 }
441 441
442 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 442 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
443 "bytes body filter: in memory fixed, %p-%p", 443 "bytes body filter: in memory fixed, %p-%p",
444 b->pos, b->last); 444 b->pos, b->last);