diff src/event/modules/ngx_epoll_module.c @ 130:82d695e3d662 NGINX_0_3_12

nginx 0.3.12 *) Security: if nginx was built with the ngx_http_realip_module and the "satisfy_any on" directive was used, then access and authorization directives did not work. The ngx_http_realip_module was not built and is not built by default. *) Change: the "$time_gmt" variable name was changed to "$time_local". *) Change: the "proxy_header_buffer_size" and "fastcgi_header_buffer_size" directives was renamed to the "proxy_buffer_size" and "fastcgi_buffer_size" directives. *) Feature: the ngx_http_memcached_module. *) Feature: the "proxy_buffering" directive. *) Bugfix: the changes in accept mutex handling when the "rtsig" method was used; bug appeared in 0.3.0. *) Bugfix: if the client sent the "Transfer-Encoding: chunked" header line, then nginx returns the 411 error. *) Bugfix: if the "auth_basic" directive was inherited from the http level, then the realm in the "WWW-Authenticate" header line was without the "Basic realm" text. *) Bugfix: if the "combined" format was explicitly specified in the "access_log" directive, then the empty lines was written to the log; bug appeared in 0.3.8. *) Bugfix: nginx did not run on the sparc platform under any OS except Solaris. *) Bugfix: now it is not necessary to place space between the quoted string and closing bracket in the "if" directive.
author Igor Sysoev <http://sysoev.ru>
date Sat, 26 Nov 2005 00:00:00 +0300
parents df17fbafec8f
children 56688ed172c8
line wrap: on
line diff
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -241,7 +241,7 @@ ngx_epoll_add_event(ngx_event_t *ev, int
     }
 
     ee.events = events | flags;
-    ee.data.u64 = (uintptr_t) c | ev->instance;
+    ee.data.ptr = (void *) ((uintptr_t) c | ev->instance);
 
     ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ev->log, 0,
                    "epoll add event: fd:%d op:%d ev:%08XD",
@@ -296,7 +296,7 @@ ngx_epoll_del_event(ngx_event_t *ev, int
     if (e->active) {
         op = EPOLL_CTL_MOD;
         ee.events = prev | flags;
-        ee.data.u64 = (uintptr_t) c | ev->instance;
+        ee.data.ptr = (void *) ((uintptr_t) c | ev->instance);
 
     } else {
         op = EPOLL_CTL_DEL;
@@ -326,7 +326,7 @@ ngx_epoll_add_connection(ngx_connection_
     struct epoll_event  ee;
 
     ee.events = EPOLLIN|EPOLLOUT|EPOLLET;
-    ee.data.u64 = (uintptr_t) c | c->read->instance;
+    ee.data.ptr = (void *) ((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);
@@ -367,7 +367,7 @@ ngx_epoll_del_connection(ngx_connection_
 
     op = EPOLL_CTL_DEL;
     ee.events = 0;
-    ee.data.u64 = 0;
+    ee.data.ptr = NULL;
 
     if (epoll_ctl(ep, op, c->fd, &ee) == -1) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,