diff options
Diffstat (limited to 'src/os')
-rw-r--r-- | src/os/unix/ngx_freebsd_init.c | 7 | ||||
-rw-r--r-- | src/os/unix/ngx_freebsd_sendfile_chain.c | 6 | ||||
-rw-r--r-- | src/os/win32/ngx_win32_config.h | 18 |
3 files changed, 28 insertions, 3 deletions
diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c index 0f02fba8b..eb66cf067 100644 --- a/src/os/unix/ngx_freebsd_init.c +++ b/src/os/unix/ngx_freebsd_init.c @@ -106,9 +106,16 @@ int ngx_os_init(ngx_log_t *log) version = ngx_freebsd_kern_osreldate; +#ifdef __DragonFly_version + ngx_log_error(NGX_LOG_INFO, log, 0, + "kern.osreldate: %d, built on %d", + version, __DragonFly_version); +#else ngx_log_error(NGX_LOG_INFO, log, 0, "kern.osreldate: %d, built on %d", version, __FreeBSD_version); +#endif + #if (HAVE_SENDFILE) diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index fb2898d6f..b8872dfc3 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -234,6 +234,9 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in) } else { rc = writev(c->fd, header.elts, header.nelts); + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, + "writev: %d of " SIZE_T_FMT, rc, hsize); + if (rc == -1) { err = ngx_errno; @@ -253,9 +256,6 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in) } sent = rc > 0 ? rc : 0; - - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, - "writev: " OFF_T_FMT, sent); } c->sent += sent; diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index a600952ea..cab3321e5 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -47,6 +47,24 @@ #pragma disable_message(202) #endif + +#ifdef __BORLANDC__ +/* the end of the precompiled headers */ +#pragma hdrstop + +#pragma warn -8027 +#pragma warn -8057 +#pragma warn -8060 + +/* STUB */ +#pragma warn -8004 +#pragma warn -8008 +#pragma warn -8065 +#pragma warn -8066 +#pragma warn -8075 +#endif + + #include <ngx_auto_config.h> |