diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-01-19 13:10:56 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-01-19 13:10:56 +0000 |
| commit | 3259e85b7a1ce51d2e65360173c373fcca3609fb (patch) | |
| tree | 6165dfb25d57d8b2d7cc914069a4c150b168354b /src/event/modules | |
| parent | fbf4fc0da9018ef2d11470b6ac295385ecf53091 (diff) | |
| download | nginx-release-0.1.15.tar.gz nginx-release-0.1.15.tar.bz2 | |
nginx-0.1.15-RELEASE importrelease-0.1.15
*) Bugfix: the error while the connecting to the FastCGI server caused
segmentation fault.
*) Bugfix: the correct handling of the regular expression, that has
different number of the captures and substitutions.
*) Feature: the location, that is passed to the FastCGI server, can be
regular expression.
*) Bugfix: the FastCGI's parameter REQUEST_URI is now passed with the
arguments and in the original state.
*) Bugfix: the ngx_http_rewrite_module module was required to be built
to use the regular expressions in locations.
*) Bugfix: the directive "proxy_preserve_host on" adds port 80 to the
"Host" headers, if upstream listen on port 80; the bug had appeared
in 0.1.14.
*) Bugfix: the same paths in autoconfiguration parameters
--http-client-body-temp-path=PATH and --http-proxy-temp-path=PATH,
or --http-client-body-temp-path=PATH and
--http-fastcgi-temp-path=PATH caused segmentation fault.
Diffstat (limited to 'src/event/modules')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index a2eeab08d..907d6aeb5 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -229,7 +229,7 @@ static int ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags) } ee.events = event | flags; - ee.data.ptr = (void *) ((uintptr_t) c | ev->instance); + ee.data.u64 = (uintptr_t) c | ev->instance; ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0, "epoll add event: fd:%d op:%d ev:%08XD", @@ -282,7 +282,7 @@ static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags) if (e->active) { op = EPOLL_CTL_MOD; ee.events = prev | flags; - ee.data.ptr = (void *) ((uintptr_t) c | ev->instance); + ee.data.u64 = (uintptr_t) c | ev->instance; } else { op = EPOLL_CTL_DEL; @@ -311,7 +311,7 @@ static int ngx_epoll_add_connection(ngx_connection_t *c) struct epoll_event ee; ee.events = EPOLLIN|EPOLLOUT|EPOLLET; - ee.data.ptr = (void *) ((uintptr_t) c | c->read->instance); + ee.data.u64 = (uintptr_t) c | c->read->instance; ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, "epoll add connection: fd:%d ev:%08XD", c->fd, ee.events); @@ -351,7 +351,7 @@ static int ngx_epoll_del_connection(ngx_connection_t *c, u_int flags) op = EPOLL_CTL_DEL; ee.events = 0; - ee.data.ptr = NULL; + ee.data.u64 = 0; if (epoll_ctl(ep, op, c->fd, &ee) == -1) { ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno, |