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, 11 insertions, 9 deletions

diff --git a/src/os/unix/ngx_solaris_init.c b/src/os/unix/ngx_solaris_init.c
index 163adaae9..93d02250f 100644
--- a/src/os/unix/ngx_solaris_init.c
+++ b/src/os/unix/ngx_solaris_init.c
@@ -13,7 +13,7 @@ char ngx_solaris_release[10];
 char ngx_solaris_version[50];
 
 
-ngx_os_io_t ngx_os_io = {
+static ngx_os_io_t ngx_solaris_io = {
     ngx_unix_recv,
     ngx_readv_chain,
     ngx_unix_send,
@@ -27,10 +27,11 @@ ngx_os_io_t ngx_os_io = {
 };
 
 
-ngx_int_t ngx_os_init(ngx_log_t *log)
+ngx_int_t
+ngx_os_specific_init(ngx_log_t *log)
 {
     if (sysinfo(SI_SYSNAME, ngx_solaris_sysname, sizeof(ngx_solaris_sysname))
-                                                                         == -1)
+        == -1)
     {
         ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
                       "sysinfo(SI_SYSNAME) failed");
@@ -38,7 +39,7 @@ ngx_int_t ngx_os_init(ngx_log_t *log)
     }
 
     if (sysinfo(SI_RELEASE, ngx_solaris_release, sizeof(ngx_solaris_release))
-                                                                         == -1)
+        == -1)
     {
         ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
                       "sysinfo(SI_RELEASE) failed");
@@ -46,7 +47,7 @@ ngx_int_t ngx_os_init(ngx_log_t *log)
     }
 
     if (sysinfo(SI_VERSION, ngx_solaris_version, sizeof(ngx_solaris_version))
-                                                                         == -1)
+        == -1)
     {
         ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
                       "sysinfo(SI_SYSNAME) failed");
@@ -54,11 +55,14 @@ ngx_int_t ngx_os_init(ngx_log_t *log)
     }
 
 
-    return ngx_posix_init(log);
+    ngx_os_io = ngx_solaris_io;
+
+    return NGX_OK;;
 }
 
 
-void ngx_os_status(ngx_log_t *log)
+void
+ngx_os_specific_status(ngx_log_t *log)
 {
 
     ngx_log_error(NGX_LOG_NOTICE, log, 0, "OS: %s %s",
@@ -66,6 +70,4 @@ void ngx_os_status(ngx_log_t *log)
 
     ngx_log_error(NGX_LOG_NOTICE, log, 0, "version: %s",
                   ngx_solaris_version);
-
-    ngx_posix_status(log);
 }