Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
checked in the upstream_test_connect_kqueue patch for the nginx 1.2.4…
… core and applied it by default.
- Loading branch information
Showing
2 changed files
with
29 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
--- nginx-1.2.4/src/http/ngx_http_upstream.c 2012-08-06 10:34:08.000000000 -0700 | ||
+++ nginx-1.2.4-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; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters