Mercurial > hg > nginx
changeset 180:2d143372a1ee
nginx-0.0.1-2003-11-12-01:16:11 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 11 Nov 2003 22:16:11 +0000 |
parents | 9f3a78b06c48 |
children | 811bdd2af794 |
files | src/core/ngx_times.c src/event/modules/ngx_iocp_module.c src/http/ngx_http_cache.c src/http/ngx_http_header_filter.c src/os/win32/ngx_files.h src/os/win32/ngx_time.c src/os/win32/ngx_time.h src/os/win32/ngx_win32_config.h |
diffstat | 8 files changed, 21 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_times.c Tue Nov 11 18:13:43 2003 +0000 +++ b/src/core/ngx_times.c Tue Nov 11 22:16:11 2003 +0000 @@ -18,7 +18,12 @@ } -/* TODO: remove strftime() */ +/* TODO: + * cache ngx_tm_t + * write own gmtime() + * remove strftime() + * we can remove localtime_r + */ void ngx_time_update() {
--- a/src/event/modules/ngx_iocp_module.c Tue Nov 11 18:13:43 2003 +0000 +++ b/src/event/modules/ngx_iocp_module.c Tue Nov 11 22:16:11 2003 +0000 @@ -164,6 +164,7 @@ ngx_err_t err; ngx_msec_t timer; ngx_event_t *ev; + struct timeval tv; ngx_epoch_msec_t delta; ngx_event_ovlp_t *ovlp;
--- a/src/http/ngx_http_cache.c Tue Nov 11 18:13:43 2003 +0000 +++ b/src/http/ngx_http_cache.c Tue Nov 11 22:16:11 2003 +0000 @@ -5,6 +5,13 @@ #include <md5.h> +/* STUB */ +#if (WIN32) +#define MD5Init MD5_Init +#define MD5Update MD5_Update +#define MD5Final MD5_Final +#endif + int ngx_http_cache_get_file(ngx_http_request_t *r, ngx_http_cache_ctx_t *ctx) {
--- a/src/http/ngx_http_header_filter.c Tue Nov 11 18:13:43 2003 +0000 +++ b/src/http/ngx_http_header_filter.c Tue Nov 11 22:16:11 2003 +0000 @@ -287,13 +287,10 @@ if (r->headers_out.content_type && r->headers_out.content_type->value.len) { h->last = ngx_cpymem(h->last, "Content-Type: ", sizeof("Content-Type: ") - 1); -#if (NGX_HTTP_LOG_ALL_HEADERS_OUT) p = h->last; -#endif h->last = ngx_cpymem(h->last, r->headers_out.content_type->value.data, r->headers_out.content_type->value.len); -#if (NGX_HTTP_LOG_ALL_HEADERS_OUT) if (r->headers_out.charset.len) { h->last = ngx_cpymem(h->last, "; charset=", sizeof("; charset=") - 1); @@ -302,7 +299,6 @@ r->headers_out.content_type->value.len = h->last - p; r->headers_out.content_type->value.data = p; -#endif } *(h->last++) = CR; *(h->last++) = LF;
--- a/src/os/win32/ngx_files.h Tue Nov 11 18:13:43 2003 +0000 +++ b/src/os/win32/ngx_files.h Tue Nov 11 22:16:11 2003 +0000 @@ -52,6 +52,10 @@ #define ngx_close_file CloseHandle #define ngx_close_file_n "CloseHandle()" +/* STUB */ +#define ngx_rename_file MoveFile +#define ngx_rename_file_n "MoveFile()" + #define ngx_mkdir(name) CreateDirectory(name, NULL) #define ngx_mkdir_n "CreateDirectory()"
--- a/src/os/win32/ngx_time.c Tue Nov 11 18:13:43 2003 +0000 +++ b/src/os/win32/ngx_time.c Tue Nov 11 22:16:11 2003 +0000 @@ -24,6 +24,6 @@ intervals = ((uint64_t) ft.dwHighDateTime << 32) | ft.dwLowDateTime; intervals -= 116444736000000000; - tp->tv_sec = intervals / 10000000; - tp->tv_usec = (intervals % 10000000) / 10; + tp->tv_sec = (long) (intervals / 10000000); + tp->tv_usec = (long) ((intervals % 10000000) / 10); }