Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_output_chain.c @ 526:0161f3197817 NGINX_0_8_15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.15 *) Security: a segmentation fault might occur in worker process while specially crafted request handling. Thanks to Chris Ries. *) Bugfix: if names .domain.tld, .sub.domain.tld, and .domain-some.tld were defined, then the name .sub.domain.tld was matched by .domain.tld. *) Bugfix: in transparency support in the ngx_http_image_filter_module. *) Bugfix: in file AIO. *) Bugfix: in X-Accel-Redirect usage; the bug had appeared in 0.8.11. *) Bugfix: in embedded perl module; the bug had appeared in 0.8.11.
author Igor Sysoev <http://sysoev.ru>
date Mon, 14 Sep 2009 00:00:00 +0400
parents 86dad910eeb6
children 005a70f9573b
comparison
equal deleted inserted replaced
525:1b64f9884263 526:0161f3197817
71 if (in) { 71 if (in) {
72 if (ngx_output_chain_add_copy(ctx->pool, &ctx->in, in) == NGX_ERROR) { 72 if (ngx_output_chain_add_copy(ctx->pool, &ctx->in, in) == NGX_ERROR) {
73 return NGX_ERROR; 73 return NGX_ERROR;
74 } 74 }
75 } 75 }
76
77 #if (NGX_HAVE_FILE_AIO)
78 if (ctx->aio) {
79 return NGX_AGAIN;
80 }
81 #endif
76 82
77 out = NULL; 83 out = NULL;
78 last_out = &out; 84 last_out = &out;
79 last = NGX_NONE; 85 last = NGX_NONE;
80 86
517 523
518 #endif 524 #endif
519 525
520 #if (NGX_HAVE_FILE_AIO) 526 #if (NGX_HAVE_FILE_AIO)
521 527
522 if (ctx->aio) { 528 if (ctx->aio_handler) {
523 n = ngx_file_aio_read(src->file, dst->pos, (size_t) size, 529 n = ngx_file_aio_read(src->file, dst->pos, (size_t) size,
524 src->file_pos, ctx->pool); 530 src->file_pos, ctx->pool);
525 if (n == NGX_AGAIN) { 531 if (n == NGX_AGAIN) {
526 ctx->aio(ctx, src->file); 532 ctx->aio_handler(ctx, src->file);
527 return NGX_AGAIN; 533 return NGX_AGAIN;
528 } 534 }
529 535
530 } else { 536 } else {
531 n = ngx_read_file(src->file, dst->pos, (size_t) size, 537 n = ngx_read_file(src->file, dst->pos, (size_t) size,