Mercurial > hg > nginx
view src/os/unix/ngx_aio_write_chain.c @ 4723:68ac485abbba stable-1.2
Merge of r4654, r4672, r4684, r4685, r4692: resolver changes.
*) Resolver: fixed format specification.
Patch by Yichun Zhang (agentzh).
*) Support for IPv6 literals and an optional port in resolver.
*) Fixed crash in ngx_resolver_cleanup_tree().
If sending a DNS request fails with an error (e.g., when mistakenly
trying to send it to a local IP broadcast), such a request is not
deleted if there are clients waiting on it. However, it was still
erroneously removed from the queue. Later ngx_resolver_cleanup_tree()
attempted to remove it from the queue again that resulted in a NULL
pointer dereference.
*) When "resolver" is configured with a domain name, only the first
resolved address was used. Now all addresses will be used.
*) Fixed segfault with poll and resolver used.
Poll event method needs ngx_cycle->files to work, and use of
ngx_exit_cycle without files set caused null pointer dereference in
resolver's cleanup on udp socket close.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 02 Jul 2012 16:23:14 +0000 |
parents | d620f497c50f |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> ngx_chain_t * ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) { u_char *buf, *prev; off_t send, sent; size_t len; ssize_t n, size; ngx_chain_t *cl; /* the maximum limit size is the maximum size_t value - the page size */ if (limit == 0 || limit > (off_t) (NGX_MAX_SIZE_T_VALUE - ngx_pagesize)) { limit = NGX_MAX_SIZE_T_VALUE - ngx_pagesize; } send = 0; sent = 0; cl = in; while (cl) { if (cl->buf->pos == cl->buf->last) { cl = cl->next; continue; } /* we can post the single aio operation only */ if (!c->write->ready) { return cl; } buf = cl->buf->pos; prev = buf; len = 0; /* coalesce the neighbouring bufs */ while (cl && prev == cl->buf->pos && send < limit) { if (ngx_buf_special(cl->buf)) { continue; } size = cl->buf->last - cl->buf->pos; if (send + size > limit) { size = limit - send; } len += size; prev = cl->buf->pos + size; send += size; cl = cl->next; } n = ngx_aio_write(c, buf, len); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_write: %z", n); if (n == NGX_ERROR) { return NGX_CHAIN_ERROR; } if (n > 0) { sent += n; c->sent += n; } ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "aio_write sent: %O", c->sent); for (cl = in; cl; cl = cl->next) { if (sent >= cl->buf->last - cl->buf->pos) { sent -= cl->buf->last - cl->buf->pos; cl->buf->pos = cl->buf->last; continue; } cl->buf->pos += sent; break; } } return cl; }