27 lines
854 B
C
27 lines
854 B
C
--- nginx-1.2.5/src/http/ngx_http_upstream.c 2012-08-06 10:34:08.000000000 -0700
|
|
+++ nginx-1.2.5-patched/src/http/ngx_http_upstream.c 2012-11-05 21:17:38.000000000 -0800
|
|
@@ -1808,10 +1808,22 @@ ngx_http_upstream_test_connect(ngx_conne
|
|
|
|
#if (NGX_HAVE_KQUEUE)
|
|
|
|
+ ngx_event_t *ev;
|
|
+
|
|
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
|
|
if (c->write->pending_eof) {
|
|
+ ev = c->write;
|
|
+
|
|
+ } else if (c->read->pending_eof) {
|
|
+ ev = c->read;
|
|
+
|
|
+ } else {
|
|
+ ev = NULL;
|
|
+ }
|
|
+
|
|
+ if (ev) {
|
|
c->log->action = "connecting to upstream";
|
|
- (void) ngx_connection_error(c, c->write->kq_errno,
|
|
+ (void) ngx_connection_error(c, ev->kq_errno,
|
|
"kevent() reported that connect() failed");
|
|
return NGX_ERROR;
|
|
}
|