Mercurial > hg > nginx
changeset 33:b2e039840718
nginx-0.0.1-2002-12-19-20:49:51 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 19 Dec 2002 17:49:51 +0000 |
parents | d45effe5854c |
children | 95f1c2a938f3 |
files | src/core/ngx_config.h src/event/ngx_event.c src/http/modules/ngx_http_log_handler.c src/http/ngx_http_output_filter.c src/os/unix/ngx_files.c src/os/unix/ngx_types.h src/os/win32/ngx_types.h |
diffstat | 7 files changed, 38 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_config.h +++ b/src/core/ngx_config.h @@ -52,6 +52,23 @@ #else /* POSIX */ + + +/* Solaris */ +#if defined(sun) && (defined(__svr4__) || defined(__SVR4)) + +#define SOLARIS 1 + +#define _FILE_OFFSET_BITS 64 /* should be before sys/types.h */ + +#ifndef HAVE_INHERITED_NONBLOCK +#define HAVE_INHERITED_NONBLOCK 1 +#endif + +#endif /* Solaris */ + + + #include <unistd.h> #include <stddef.h> /* offsetof */ #include <stdlib.h>
--- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -22,7 +22,7 @@ ngx_event_t *ngx_read_events, *n #if !(USE_KQUEUE) -#if 0 +#if 1 ngx_event_type_e ngx_event_type = NGX_SELECT_EVENT; #else ngx_event_type_e ngx_event_type = NGX_KQUEUE_EVENT;
--- a/src/http/modules/ngx_http_log_handler.c +++ b/src/http/modules/ngx_http_log_handler.c @@ -22,11 +22,11 @@ int ngx_http_log_handler(ngx_http_reques ngx_log_debug(r->connection->log, "log handler"); - /* %a, 20:%c, 22:%d, 3:%s, 20:%b, 5*" ", "2/1: "\r\n" */ + /* 10:%con, 22:%date, 2:%"%r", 3:%status, 20:%bytes, 5*" ", 2/1: "\r\n" */ #if (WIN32) - len = 2 + 20 + 22 + 3 + 20 + 5 + + 2; + len = 10 + 22 + 2 + 3 + 20 + 5 + 2; #else - len = 2 + 20 + 22 + 3 + 20 + 5 + + 1; + len = 10 + 22 + 2 + 3 + 20 + 5 + 1; #endif len += r->connection->addr_text.len; @@ -67,7 +67,7 @@ int ngx_http_log_handler(ngx_http_reques *p++ = ' '; - p += ngx_snprintf(p, 21, QD_FMT, r->connection->sent); + p += ngx_snprintf(p, 21, OFF_FMT, r->connection->sent); #if (WIN32) *p++ = CR; *p++ = LF;
--- a/src/http/ngx_http_output_filter.c +++ b/src/http/ngx_http_output_filter.c @@ -1,4 +1,5 @@ +#include <ngx_config.h> #include <ngx_core.h> #include <ngx_files.h> #include <ngx_string.h>
--- a/src/os/unix/ngx_files.c +++ b/src/os/unix/ngx_files.c @@ -1,4 +1,5 @@ +#include <ngx_config.h> #include <ngx_core.h> #include <ngx_file.h>
--- a/src/os/unix/ngx_types.h +++ b/src/os/unix/ngx_types.h @@ -5,8 +5,19 @@ #include <ngx_config.h> -#define QD_FMT "%qd" -#define QX_FMT "%qx" +#ifdef SOLARIS + +#define QD_FMT "%lld" +#define QX_FMT "%llx" +#define OFF_FMT "%lld" + +#else + +#define QD_FMT "%qd" +#define QX_FMT "%qx" +#define OFF_FMT "%qd" + +#endif #endif /* _NGX_TYPES_H_INCLUDED_ */