186526
/
openresty
mirror of https://github.com/openresty/openresty.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated resolver_wev_handler_segfault_with_poll.patch to Ruslan Ermilov's version.

This commit is contained in:
agentzh (Yichun Zhang) 2013-01-23 15:17:04 -08:00
parent fc1929f37d
commit 8e35463045
2 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
patches/nginx-1.2.6-resolver_wev_handler_segfault_with_poll.patch
View File

@ -1,29 +1,31 @@
--- nginx-1.2.6/src/core/ngx_resolver.c 2012-11-12 10:47:07.000000000 -0800
+++ nginx-1.2.6-patched/src/core/ngx_resolver.c 2013-01-22 14:52:42.716434183 -0800
@@ -91,6 +91,7 @@ static void *ngx_resolver_dup(ngx_resolv
static in_addr_t *ngx_resolver_rotate(ngx_resolver_t *r, in_addr_t *src,
ngx_uint_t n);
static u_char *ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len);
+static void ngx_resolver_empty_handler(ngx_event_t *ev);
--- nginx-1.2.6/src/event/modules/ngx_poll_module.c 2012-01-18 07:07:43.000000000 -0800
+++ nginx-1.2.6-patched/src/event/modules/ngx_poll_module.c 2013-01-23 12:34:13.990781456 -0800
@@ -367,11 +367,18 @@ ngx_poll_process_events(ngx_cycle_t *cyc
*/
ngx_resolver_t *
@@ -2258,6 +2259,8 @@ ngx_udp_connect(ngx_udp_connection_t *uc
rev->log = &uc->log;
wev->log = &uc->log;
+ wev->handler = ngx_resolver_empty_handler;
revents |= POLLIN|POLLOUT;
+ if (c->read->active) {
+ revents |= POLLIN;
+ }
+
uc->connection = c;
+ if (c->write->active) {
+ revents |= POLLOUT;
+ }
}
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
@@ -2311,3 +2314,9 @@ ngx_udp_connect(ngx_udp_connection_t *uc
found = 0;
- if (revents & POLLIN) {
+ if ((revents & POLLIN) && c->read->active) {
found = 1;
ev = c->read;
@@ -388,7 +395,7 @@ ngx_poll_process_events(ngx_cycle_t *cyc
ngx_locked_post_event(ev, queue);
}
- if (revents & POLLOUT) {
+ if ((revents & POLLOUT) && c->write->active) {
found = 1;
ev = c->write;
return NGX_OK;
}
+
+
+static void
+ngx_resolver_empty_handler(ngx_event_t *ev)
+{
+}

52
patches/nginx-1.3.7-resolver_wev_handler_segfault_with_poll.patch
View File

@ -1,29 +1,31 @@
--- nginx-1.3.7/src/core/ngx_resolver.c 2012-11-12 10:47:07.000000000 -0800
+++ nginx-1.3.7-patched/src/core/ngx_resolver.c 2013-01-22 14:52:42.716434183 -0800
@@ -91,6 +91,7 @@ static void *ngx_resolver_dup(ngx_resolv
static in_addr_t *ngx_resolver_rotate(ngx_resolver_t *r, in_addr_t *src,
ngx_uint_t n);
static u_char *ngx_resolver_log_error(ngx_log_t *log, u_char *buf, size_t len);
+static void ngx_resolver_empty_handler(ngx_event_t *ev);
--- nginx-1.3.7/src/event/modules/ngx_poll_module.c 2012-01-18 07:07:43.000000000 -0800
+++ nginx-1.3.7-patched/src/event/modules/ngx_poll_module.c 2013-01-23 12:34:13.990781456 -0800
@@ -367,11 +367,18 @@ ngx_poll_process_events(ngx_cycle_t *cyc
*/
ngx_resolver_t *
@@ -2258,6 +2259,8 @@ ngx_udp_connect(ngx_udp_connection_t *uc
rev->log = &uc->log;
wev->log = &uc->log;
+ wev->handler = ngx_resolver_empty_handler;
revents |= POLLIN|POLLOUT;
+ if (c->read->active) {
+ revents |= POLLIN;
+ }
+
uc->connection = c;
+ if (c->write->active) {
+ revents |= POLLOUT;
+ }
}
c->number = ngx_atomic_fetch_add(ngx_connection_counter, 1);
@@ -2311,3 +2314,9 @@ ngx_udp_connect(ngx_udp_connection_t *uc
found = 0;
- if (revents & POLLIN) {
+ if ((revents & POLLIN) && c->read->active) {
found = 1;
ev = c->read;
@@ -388,7 +395,7 @@ ngx_poll_process_events(ngx_cycle_t *cyc
ngx_locked_post_event(ev, queue);
}
- if (revents & POLLOUT) {
+ if ((revents & POLLOUT) && c->write->active) {
found = 1;
ev = c->write;
return NGX_OK;
}
+
+
+static void
+ngx_resolver_empty_handler(ngx_event_t *ev)
+{
+}