diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-09-08 14:36:09 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-09-08 14:36:09 +0000 |
| commit | e573380f247f4840dd27b40e76c587196a84f106 (patch) | |
| tree | 2bf9b16bbd3f9213fcb05fe3962938f24bf02677 /src/os | |
| parent | 6f8cd96a9b0394589fbcfa75e9d26ef4f881d51b (diff) | |
| download | nginx-release-0.1.45.tar.gz nginx-release-0.1.45.tar.bz2 | |
nginx-0.1.45-RELEASE importrelease-0.1.45
*) Change: the "ssl_engine" directive was canceled in the
ngx_http_ssl_module and now is introduced at global level.
*) Bugfix: the responses with SSI subrequests did not transferred via
SSL connection.
*) Various bug fixes in the IMAP/POP3 proxy.
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/unix/ngx_posix_init.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_init.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c index c8b0548ce..97aa8761f 100644 --- a/src/os/unix/ngx_posix_init.c +++ b/src/os/unix/ngx_posix_init.c @@ -30,8 +30,6 @@ ngx_os_io_t ngx_os_io = { ngx_int_t ngx_os_init(ngx_log_t *log) { - ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER); - #if (NGX_HAVE_OS_SPECIFIC_INIT) if (ngx_os_specific_init(log) != NGX_OK) { return NGX_ERROR; @@ -67,6 +65,8 @@ ngx_os_init(ngx_log_t *log) void ngx_os_status(ngx_log_t *log) { + ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER); + #if (NGX_HAVE_OS_SPECIFIC_INIT) ngx_os_specific_status(log); #endif diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c index 2b8891321..9c3df96f7 100644 --- a/src/os/win32/ngx_win32_init.c +++ b/src/os/win32/ngx_win32_init.c @@ -6,6 +6,7 @@ #include <ngx_config.h> #include <ngx_core.h> +#include <nginx.h> ngx_uint_t ngx_win32_version; @@ -166,6 +167,8 @@ void ngx_os_status(ngx_log_t *log) { ngx_osviex_stub_t *osviex_stub; + ngx_log_error(NGX_LOG_NOTICE, log, 0, NGINX_VER); + if (osviex) { /* |