diff options
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/unix/ngx_sendfile.h | 19 | ||||
| -rw-r--r-- | src/os/unix/ngx_time.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_files.h | 3 | ||||
| -rw-r--r-- | src/os/win32/ngx_sendfile.h | 20 |
4 files changed, 5 insertions, 39 deletions
diff --git a/src/os/unix/ngx_sendfile.h b/src/os/unix/ngx_sendfile.h deleted file mode 100644 index c9a59235f..000000000 --- a/src/os/unix/ngx_sendfile.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _NGX_SENDFILE_H_INCLUDED_ -#define _NGX_SENDFILE_H_INCLUDED_ - - -#include <ngx_types.h> -#include <ngx_files.h> -#include <ngx_socket.h> -#include <ngx_log.h> -#include <ngx_sendv.h> - -int ngx_sendfile(ngx_socket_t s, - ngx_iovec_t *headers, int hdr_cnt, - ngx_fd_t fd, off_t offset, size_t nbytes, - ngx_iovec_t *trailers, int trl_cnt, - off_t *sent, - ngx_log_t *log); - - -#endif /* _NGX_SENDFILE_H_INCLUDED_ */ diff --git a/src/os/unix/ngx_time.c b/src/os/unix/ngx_time.c index 5dfcb63f2..26ef6462d 100644 --- a/src/os/unix/ngx_time.c +++ b/src/os/unix/ngx_time.c @@ -6,6 +6,8 @@ void ngx_localtime(ngx_tm_t *tm) { time_t clock = time(NULL); localtime_r(&clock, tm); + tm->ngx_tm_mon++; + tm->ngx_tm_year += 1900; } u_int ngx_msec(void) diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h index 8cd58efc7..f5e50cc9f 100644 --- a/src/os/win32/ngx_files.h +++ b/src/os/win32/ngx_files.h @@ -22,7 +22,10 @@ typedef BY_HANDLE_FILE_INFORMATION ngx_file_info_t; #define ngx_open_file(name, flags) \ CreateFile(name, flags, \ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, \ + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL) +/* NULL, OPEN_EXISTING, 0, NULL) +*/ #define ngx_open_file_n "CreateFile()" diff --git a/src/os/win32/ngx_sendfile.h b/src/os/win32/ngx_sendfile.h deleted file mode 100644 index a80750bef..000000000 --- a/src/os/win32/ngx_sendfile.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _NGX_SENDFILE_H_INCLUDED_ -#define _NGX_SENDFILE_H_INCLUDED_ - - -#include <ngx_config.h> -#include <ngx_types.h> -#include <ngx_files.h> -#include <ngx_socket.h> -#include <ngx_log.h> -#include <ngx_sendv.h> - -int ngx_sendfile(ngx_socket_t s, - ngx_iovec_t *headers, int hdr_cnt, - ngx_fd_t fd, off_t offset, size_t nbytes, - ngx_iovec_t *trailers, int trl_cnt, - off_t *sent, - ngx_log_t *log); - - -#endif /* _NGX_SENDFILE_H_INCLUDED_ */ |