comparison src/http/modules/ngx_http_flv_module.c @ 4659:f12d474f0d5e stable-1.2

Merge of r4612: proper subrequest handling in various modules.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 04 Jun 2012 10:27:00 +0000
parents 13e09cf11d4e
children 192f54280a7a
comparison
equal deleted inserted replaced
4658:c92289afb5be 4659:f12d474f0d5e
233 233
234 b->file_pos = start; 234 b->file_pos = start;
235 b->file_last = of.size; 235 b->file_last = of.size;
236 236
237 b->in_file = b->file_last ? 1: 0; 237 b->in_file = b->file_last ? 1: 0;
238 b->last_buf = 1; 238 b->last_buf = (r == r->main) ? 1 : 0;
239 b->last_in_chain = 1; 239 b->last_in_chain = 1;
240 240
241 b->file->fd = of.fd; 241 b->file->fd = of.fd;
242 b->file->name = path; 242 b->file->name = path;
243 b->file->log = log; 243 b->file->log = log;