Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 4952:3795aeb360fb stable-1.2
Merge of r4915, r4916, r4917: upstream minor fixes.
*) Upstream: honor the "down" flag for a single server.
If an upstream block was defined with the only server marked as
"down", e.g.
upstream u {
server 127.0.0.1:8080 down;
}
an attempt was made to contact the server despite the "down" flag.
It is believed that immediate 502 response is better in such a
case, and it's also consistent with what is currently done in case
of multiple servers all marked as "down".
*) Upstream: better detection of connect() failures with kqueue.
Pending EOF might be reported on both read and write events, whichever
comes first, so check both of them.
Patch by Yichun Zhang (agentzh), slightly modified.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 10 Dec 2012 16:35:32 +0000 |
| parents | 826ca1b53376 |
| children | 48d1606107d4 |
comparison
equal
deleted
inserted
replaced
| 4951:9ab61d17794f | 4952:3795aeb360fb |
|---|---|
| 1807 socklen_t len; | 1807 socklen_t len; |
| 1808 | 1808 |
| 1809 #if (NGX_HAVE_KQUEUE) | 1809 #if (NGX_HAVE_KQUEUE) |
| 1810 | 1810 |
| 1811 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { | 1811 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { |
| 1812 if (c->write->pending_eof) { | 1812 if (c->write->pending_eof || c->read->pending_eof) { |
| 1813 if (c->write->pending_eof) { | |
| 1814 err = c->write->kq_errno; | |
| 1815 | |
| 1816 } else { | |
| 1817 err = c->read->kq_errno; | |
| 1818 } | |
| 1819 | |
| 1813 c->log->action = "connecting to upstream"; | 1820 c->log->action = "connecting to upstream"; |
| 1814 (void) ngx_connection_error(c, c->write->kq_errno, | 1821 (void) ngx_connection_error(c, err, |
| 1815 "kevent() reported that connect() failed"); | 1822 "kevent() reported that connect() failed"); |
| 1816 return NGX_ERROR; | 1823 return NGX_ERROR; |
| 1817 } | 1824 } |
| 1818 | 1825 |
| 1819 } else | 1826 } else |