commit 732a27196381164c799d345ec0d010b416408555
author Igor Sysoev <igor@sysoev.ru> Wed Apr 21 18:54:33 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Apr 21 18:54:33 2004 +0000
tree 043848398927223e1b08d1b15c071b3a23717d76
parent bb570859043557c5c1b20d933ff2e4c18d13c980

nginx-0.0.3-2004-04-21-22:54:33 import

src/event/ngx_event.c

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 002d296..cc03b58 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -56,6 +56,7 @@
 ngx_atomic_t                     *ngx_accept_mutex;
 ngx_uint_t                        ngx_accept_mutex_held;
 ngx_msec_t                        ngx_accept_mutex_delay;
+ngx_int_t                         ngx_accept_disabled;
 
 
 
@@ -464,13 +465,13 @@
 
     ngx_str_t  *value;
 
-    if (ecf->connections != NGX_CONF_UNSET) {
+    if (ecf->connections != NGX_CONF_UNSET_UINT) {
         return "is duplicate" ;
     }
 
     value = cf->args->elts;
     ecf->connections = ngx_atoi(value[1].data, value[1].len);
-    if (ecf->connections == NGX_ERROR) {
+    if (ecf->connections == (ngx_uint_t) NGX_ERROR) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid number \"%s\"", value[1].data);
 
@@ -598,7 +599,7 @@
     ngx_test_null(ecf, ngx_palloc(cycle->pool, sizeof(ngx_event_conf_t)),
                   NGX_CONF_ERROR);
 
-    ecf->connections = NGX_CONF_UNSET;
+    ecf->connections = NGX_CONF_UNSET_UINT;
     ecf->use = NGX_CONF_UNSET;
     ecf->multi_accept = NGX_CONF_UNSET;
     ecf->accept_mutex = NGX_CONF_UNSET;
@@ -620,25 +621,25 @@
 
 #if (HAVE_KQUEUE)
 
-    ngx_conf_init_value(ecf->connections, DEFAULT_CONNECTIONS);
+    ngx_conf_init_unsigned_value(ecf->connections, DEFAULT_CONNECTIONS);
     ngx_conf_init_value(ecf->use, ngx_kqueue_module.ctx_index);
     ngx_conf_init_ptr_value(ecf->name, ngx_kqueue_module_ctx.name->data);
 
 #elif (HAVE_DEVPOLL)
 
-    ngx_conf_init_value(ecf->connections, DEFAULT_CONNECTIONS);
+    ngx_conf_init_unsigned_value(ecf->connections, DEFAULT_CONNECTIONS);
     ngx_conf_init_value(ecf->use, ngx_devpoll_module.ctx_index);
     ngx_conf_init_ptr_value(ecf->name, ngx_devpoll_module_ctx.name->data);
 
 #elif (HAVE_EPOLL)
 
-    ngx_conf_init_value(ecf->connections, DEFAULT_CONNECTIONS);
+    ngx_conf_init_unsigned_value(ecf->connections, DEFAULT_CONNECTIONS);
     ngx_conf_init_value(ecf->use, ngx_epoll_module.ctx_index);
     ngx_conf_init_ptr_value(ecf->name, ngx_epoll_module_ctx.name->data);
 
 #elif (HAVE_SELECT)
 
-    ngx_conf_init_value(ecf->connections,
+    ngx_conf_init_unsigned_value(ecf->connections,
           FD_SETSIZE < DEFAULT_CONNECTIONS ? FD_SETSIZE : DEFAULT_CONNECTIONS);
 
     ngx_conf_init_value(ecf->use, ngx_select_module.ctx_index);