Mercurial > hg > nginx-vendor-current

diff src/os/unix/ngx_linux_init.c @ 88:e916a291e9aa NGINX_0_1_44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.44 *) Feature: the IMAP/POP3 proxy supports SSL. *) Feature: the "proxy_timeout" directive of the ngx_imap_proxy_module. *) Feature: the "userid_mark" directive. *) Feature: the $remote_user variable value is determined independently of authorization use.
author Igor Sysoev <http://sysoev.ru>
date Tue, 06 Sep 2005 00:00:00 +0400
parents 6ae11d59d10e
children dd6c66b5b0e2
line wrap: on
line diff
--- a/src/os/unix/ngx_linux_init.c
+++ b/src/os/unix/ngx_linux_init.c
@@ -14,7 +14,7 @@ char ngx_linux_kern_osrelease[20];
 int ngx_linux_rtsig_max;
 
 
-ngx_os_io_t ngx_os_io = {
+static ngx_os_io_t ngx_linux_io = {
     ngx_unix_recv,
     ngx_readv_chain,
     ngx_unix_send,
@@ -29,7 +29,7 @@ ngx_os_io_t ngx_os_io = {
 
 
 ngx_int_t
-ngx_os_init(ngx_log_t *log)
+ngx_os_specific_init(ngx_log_t *log)
 {
     int        name[2];
     size_t     len;
@@ -74,19 +74,18 @@ ngx_os_init(ngx_log_t *log)
     }
 
 
-    return ngx_posix_init(log);
+    ngx_os_io = ngx_linux_io;
+
+    return NGX_OK;
 }
 
 
 void
-ngx_os_status(ngx_log_t *log)
+ngx_os_specific_status(ngx_log_t *log)
 {
     ngx_log_error(NGX_LOG_NOTICE, log, 0, "OS: %s %s",
                   ngx_linux_kern_ostype, ngx_linux_kern_osrelease);
 
     ngx_log_error(NGX_LOG_NOTICE, log, 0, "sysctl(KERN_RTSIGMAX): %d",
                   ngx_linux_rtsig_max);
-
-
-    ngx_posix_status(log);
 }