nginx-0.1.44-RELEASE importrelease-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.

1 files changed, 9 insertions, 8 deletions

diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c
index ab002ae29..8610a5638 100644
--- a/src/os/unix/ngx_freebsd_init.c
+++ b/src/os/unix/ngx_freebsd_init.c
@@ -27,7 +27,7 @@ ngx_uint_t ngx_freebsd_sendfile_nbytes_bug;
 ngx_uint_t ngx_freebsd_use_tcp_nopush;
 
 
-ngx_os_io_t ngx_os_io = {
+static ngx_os_io_t ngx_freebsd_io = {
     ngx_unix_recv,
     ngx_readv_chain,
     ngx_unix_send,
@@ -74,7 +74,8 @@ sysctl_t sysctls[] = {
 };
 
 
-void ngx_debug_init()
+void
+ngx_debug_init()
 {
 #if (NGX_DEBUG && !NGX_NO_DEBUG_MALLOC)
 
@@ -88,7 +89,8 @@ void ngx_debug_init()
 }
 
 
-ngx_int_t ngx_os_init(ngx_log_t *log)
+ngx_int_t
+ngx_os_specific_init(ngx_log_t *log)
 {
     int         version, somaxconn;
     size_t      size;
@@ -223,12 +225,14 @@ ngx_int_t ngx_os_init(ngx_log_t *log)
 
     ngx_tcp_nodelay_and_tcp_nopush = 1;
 
+    ngx_os_io = ngx_freebsd_io;
 
-    return ngx_posix_init(log);
+    return NGX_OK;
 }
 
 
-void ngx_os_status(ngx_log_t *log)
+void
+ngx_os_specific_status(ngx_log_t *log)
 {
     ngx_uint_t  i;
 
@@ -251,7 +255,4 @@ void ngx_os_status(ngx_log_t *log)
                           sysctls[i].name, *sysctls[i].value);
         }
     }
-
-
-    ngx_posix_status(log);
 }