Mercurial > hg > nginx-vendor-1-0

comparison src/core/ngx_output_chain.c @ 306:55328d69b335 NGINX_0_5_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.5.23 *) Feature: the ngx_http_ssl_module supports Server Name Indication TLS extension. *) Feature: the "fastcgi_catch_stderr" directive. Thanks to Nick S. Grechukh, OWOX project. *) Bugfix: a segmentation fault occurred in master process if two virtual servers should bind() to the overlapping ports. *) Bugfix: if nginx was built with ngx_http_perl_module and perl supported threads, then during second reconfiguration the error messages "panic: MUTEX_LOCK" and "perl_parse() failed" were issued. *) Bugfix: in the HTTPS protocol in the "proxy_pass" directive.
author Igor Sysoev <http://sysoev.ru>
date Mon, 04 Jun 2007 00:00:00 +0400
parents e4f4cbfed5f5
children 94e16de3c33f
comparison
equal deleted inserted replaced
305:892db29abb4f 306:55328d69b335
375 375
376 } else { 376 } else {
377 dst->in_file = 0; 377 dst->in_file = 0;
378 } 378 }
379 379
380 if (src->last_buf && src->pos == src->last) { 380 if (src->pos == src->last) {
381 dst->last_buf = 1; 381 dst->flush = src->flush;
382 dst->last_buf = src->last_buf;
382 } 383 }
383 384
384 } else { 385 } else {
385 n = ngx_read_file(src->file, dst->pos, (size_t) size, src->file_pos); 386 n = ngx_read_file(src->file, dst->pos, (size_t) size, src->file_pos);
386 387
415 dst->in_file = 0; 416 dst->in_file = 0;
416 } 417 }
417 418
418 src->file_pos += n; 419 src->file_pos += n;
419 420
420 if (src->last_buf && src->file_pos == src->file_last) { 421 if (src->pos == src->last) {
421 dst->last_buf = 1; 422 dst->flush = src->flush;
423 dst->last_buf = src->last_buf;
422 } 424 }
423 } 425 }
424 426
425 return NGX_OK; 427 return NGX_OK;
426 } 428 }
442 } 444 }
443 #endif 445 #endif
444 446
445 size += ngx_buf_size(in->buf); 447 size += ngx_buf_size(in->buf);
446 448
447 ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->connection->log, 0, 449 ngx_log_debug2(NGX_LOG_DEBUG_CORE, ctx->connection->log, 0,
448 "chain writer buf size: %uO", ngx_buf_size(in->buf)); 450 "chain writer buf fl:%d s:%uO",
451 in->buf->flush, ngx_buf_size(in->buf));
449 452
450 cl = ngx_alloc_chain_link(ctx->pool); 453 cl = ngx_alloc_chain_link(ctx->pool);
451 if (cl == NULL) { 454 if (cl == NULL) {
452 return NGX_ERROR; 455 return NGX_ERROR;
453 } 456 }