nginx-0.1.8-RELEASE import
*) Bugfix: in the ngx_http_autoindex_module if the long file names were
in the listing.
*) Feature: the "^~" modifier in the location directive.
*) Feature: the proxy_max_temp_file_size directive.
diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h
index 9a392f8..e87ec5f 100644
--- a/src/os/unix/ngx_errno.h
+++ b/src/os/unix/ngx_errno.h
@@ -34,6 +34,7 @@
#define NGX_ETIMEDOUT ETIMEDOUT
#define NGX_ECONNREFUSED ECONNREFUSED
#define NGX_EHOSTUNREACH EHOSTUNREACH
+#define NGX_ENOSYS ENOSYS
#define NGX_ECANCELED ECANCELED
#define NGX_ENOMOREFILES 0
diff --git a/src/os/unix/ngx_files.c b/src/os/unix/ngx_files.c
index 7bf5ad1..52aa9b6 100644
--- a/src/os/unix/ngx_files.c
+++ b/src/os/unix/ngx_files.c
@@ -109,7 +109,7 @@
}
-int ngx_open_tempfile(u_char *name, ngx_uint_t persistent)
+ngx_fd_t ngx_open_tempfile(u_char *name, ngx_uint_t persistent)
{
ngx_fd_t fd;
@@ -216,7 +216,7 @@
}
-int ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
+ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
{
dir->dir = opendir((const char *) name->data);
diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index b789d61..03de946 100644
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -37,7 +37,7 @@
#define ngx_delete_file_n "unlink()"
-int ngx_open_tempfile(u_char *name, ngx_uint_t persistent);
+ngx_fd_t ngx_open_tempfile(u_char *name, ngx_uint_t persistent);
#define ngx_open_tempfile_n "open()"
@@ -77,7 +77,7 @@
#define NGX_DIR_MASK_LEN 0
-int ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
+ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
#define ngx_open_dir_n "opendir()"
diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h
index 4840a99..7f3b286 100644
--- a/src/os/unix/ngx_freebsd_config.h
+++ b/src/os/unix/ngx_freebsd_config.h
@@ -60,41 +60,23 @@
#include <ngx_auto_config.h>
-#ifndef HAVE_SELECT
-#define HAVE_SELECT 1
-#endif
-
-
-#ifndef HAVE_POLL
-#define HAVE_POLL 1
-#endif
#if (HAVE_POLL)
#include <poll.h>
#endif
- /* FreeBSD aio supported via kqueue */
-
-#if (__FreeBSD__ == 4 && __FreeBSD_version >= 430000) \
- || __FreeBSD_version >= 500014
-
-#ifndef HAVE_AIO
-#define HAVE_AIO 1
-#endif
-
-#endif
#if (HAVE_AIO)
#include <aio.h>
#endif
-#if defined SO_ACCEPTFILTER && !defined HAVE_DEFERRED_ACCEPT
-#define HAVE_DEFERRED_ACCEPT 1
+#if (HAVE_KQUEUE)
+#include <sys/event.h>
#endif
-#if (HAVE_KQUEUE)
-#include <sys/event.h>
+#if defined SO_ACCEPTFILTER && !defined HAVE_DEFERRED_ACCEPT
+#define HAVE_DEFERRED_ACCEPT 1
#endif
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index fb2cbc8..57ee505 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -63,19 +63,11 @@
#endif
-
-#ifndef HAVE_SELECT
-#define HAVE_SELECT 1
-#endif
-
-
-#ifndef HAVE_POLL
-#define HAVE_POLL 1
-#endif
#if (HAVE_POLL)
#include <poll.h>
#endif
+
#if (HAVE_EPOLL)
#include <sys/epoll.h>
#endif /* HAVE_EPOLL */
diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c
index 3c7d344..397d342 100644
--- a/src/os/unix/ngx_linux_init.c
+++ b/src/os/unix/ngx_linux_init.c
@@ -30,8 +30,9 @@
ngx_int_t ngx_os_init(ngx_log_t *log)
{
- int name[2];
- size_t len;
+ int name[2];
+ size_t len;
+ ngx_err_t err;
name[0] = CTL_KERN;
name[1] = KERN_OSTYPE;
@@ -58,10 +59,16 @@
name[1] = KERN_RTSIGMAX;
len = sizeof(ngx_linux_rtsig_max);
if (sysctl(name, sizeof(name), &ngx_linux_rtsig_max, &len, NULL, 0) == -1) {
- ngx_log_error(NGX_LOG_INFO, log, ngx_errno,
- "sysctl(KERN_RTSIGMAX) failed");
- ngx_linux_rtsig_max = 0;
+ err = ngx_errno;
+ if (err != NGX_ENOTDIR) {
+ ngx_log_error(NGX_LOG_ALERT, log, err,
+ "sysctl(KERN_RTSIGMAX) failed");
+
+ return NGX_ERROR;
+ }
+
+ ngx_linux_rtsig_max = 0;
}
ngx_init_setproctitle(log);
diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h
index bac02f7..b187236 100644
--- a/src/os/unix/ngx_posix_config.h
+++ b/src/os/unix/ngx_posix_config.h
@@ -14,6 +14,11 @@
#endif
+#if 0
+#define _REENTRANT
+#endif
+
+
#include <sys/types.h>
#include <sys/time.h>
#if (NGX_HAVE_UNISTD_H)
@@ -65,14 +70,6 @@
#include <ngx_auto_config.h>
-#ifndef HAVE_SELECT
-#define HAVE_SELECT 1
-#endif
-
-
-#ifndef HAVE_POLL
-#define HAVE_POLL 1
-#endif
#if (HAVE_POLL)
#include <poll.h>
#endif
@@ -104,7 +101,11 @@
#endif
+#if (NGX_HAVE_SETPROCTITLE)
+#define ngx_setproctitle setproctitle
+#else
#define ngx_setproctitle(title)
+#endif
#define NGX_POSIX_IO 1
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 0447bc4..37b2ef1 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -12,15 +12,18 @@
static void ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n,
ngx_int_t type);
+static void ngx_start_garbage_collector(ngx_cycle_t *cycle, ngx_int_t type);
static void ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo);
static ngx_uint_t ngx_reap_childs(ngx_cycle_t *cycle);
static void ngx_master_exit(ngx_cycle_t *cycle);
static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data);
+static void ngx_worker_process_init(ngx_cycle_t *cycle);
static void ngx_channel_handler(ngx_event_t *ev);
#if (NGX_THREADS)
static void ngx_wakeup_worker_threads(ngx_cycle_t *cycle);
static void *ngx_worker_thread_cycle(void *data);
#endif
+static void ngx_garbage_collector_cycle(ngx_cycle_t *cycle, void *data);
ngx_uint_t ngx_process;
@@ -109,6 +112,7 @@
ngx_start_worker_processes(cycle, ccf->worker_processes,
NGX_PROCESS_RESPAWN);
+ ngx_start_garbage_collector(cycle, NGX_PROCESS_RESPAWN);
ngx_new_binary = 0;
delay = 0;
@@ -179,6 +183,7 @@
if (!ngx_noaccepting) {
ngx_start_worker_processes(cycle, ccf->worker_processes,
NGX_PROCESS_JUST_RESPAWN);
+ ngx_start_garbage_collector(cycle, NGX_PROCESS_JUST_RESPAWN);
live = 1;
ngx_signal_worker_processes(cycle,
ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
@@ -193,6 +198,7 @@
ngx_start_worker_processes(cycle, ccf->worker_processes,
NGX_PROCESS_RESPAWN);
+ ngx_start_garbage_collector(cycle, NGX_PROCESS_RESPAWN);
ngx_noaccepting = 0;
continue;
@@ -211,6 +217,7 @@
ngx_core_module);
ngx_start_worker_processes(cycle, ccf->worker_processes,
NGX_PROCESS_JUST_RESPAWN);
+ ngx_start_garbage_collector(cycle, NGX_PROCESS_JUST_RESPAWN);
live = 1;
ngx_signal_worker_processes(cycle,
ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
@@ -220,6 +227,7 @@
ngx_restart = 0;
ngx_start_worker_processes(cycle, ccf->worker_processes,
NGX_PROCESS_RESPAWN);
+ ngx_start_garbage_collector(cycle, NGX_PROCESS_RESPAWN);
live = 1;
}
@@ -352,6 +360,47 @@
}
+static void ngx_start_garbage_collector(ngx_cycle_t *cycle, ngx_int_t type)
+{
+ ngx_int_t i;
+ ngx_channel_t ch;
+
+ return;
+
+ ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "start garbage collector");
+
+ ch.command = NGX_CMD_OPEN_CHANNEL;
+
+ ngx_spawn_process(cycle, ngx_garbage_collector_cycle, NULL,
+ "garbage collector", type);
+
+ ch.pid = ngx_processes[ngx_process_slot].pid;
+ ch.slot = ngx_process_slot;
+ ch.fd = ngx_processes[ngx_process_slot].channel[0];
+
+ for (i = 0; i < ngx_last_process; i++) {
+
+ if (i == ngx_process_slot
+ || ngx_processes[i].pid == -1
+ || ngx_processes[i].channel[0] == -1)
+ {
+ continue;
+ }
+
+ ngx_log_debug6(NGX_LOG_DEBUG_CORE, cycle->log, 0,
+ "pass channel s:%d pid:%P fd:%d to s:%i pid:%P fd:%d",
+ ch.slot, ch.pid, ch.fd,
+ i, ngx_processes[i].pid,
+ ngx_processes[i].channel[0]);
+
+ /* TODO: NGX_AGAIN */
+
+ ngx_write_channel(ngx_processes[i].channel[0],
+ &ch, sizeof(ngx_channel_t), cycle->log);
+ }
+}
+
+
static void ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo)
{
ngx_int_t i;
@@ -558,116 +607,7 @@
static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
{
- sigset_t set;
- ngx_err_t err;
- ngx_int_t n;
- ngx_uint_t i;
- struct timeval tv;
- ngx_listening_t *ls;
- ngx_core_conf_t *ccf;
- ngx_connection_t *c;
-
-
- ngx_gettimeofday(&tv);
-
- ngx_start_msec = (ngx_epoch_msec_t) tv.tv_sec * 1000 + tv.tv_usec / 1000;
- ngx_old_elapsed_msec = 0;
- ngx_elapsed_msec = 0;
-
-
- ngx_process = NGX_PROCESS_WORKER;
-
- ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-
- if (geteuid() == 0) {
- if (setgid(ccf->group) == -1) {
- ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
- "setgid(%d) failed", ccf->group);
- /* fatal */
- exit(2);
- }
-
- if (setuid(ccf->user) == -1) {
- ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
- "setuid(%d) failed", ccf->user);
- /* fatal */
- exit(2);
- }
- }
-
-#if (NGX_HAVE_PR_SET_DUMPABLE)
-
- /* allow coredump after setuid() in Linux 2.4.x */
-
- if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) {
- ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
- "prctl(PR_SET_DUMPABLE) failed");
- }
-
-#endif
-
- sigemptyset(&set);
-
- if (sigprocmask(SIG_SETMASK, &set, NULL) == -1) {
- ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
- "sigprocmask() failed");
- }
-
- ngx_init_temp_number();
-
- /*
- * disable deleting previous events for the listening sockets because
- * in the worker processes there are no events at all at this point
- */
- ls = cycle->listening.elts;
- for (i = 0; i < cycle->listening.nelts; i++) {
- ls[i].remain = 0;
- }
-
- for (i = 0; ngx_modules[i]; i++) {
- if (ngx_modules[i]->init_process) {
- if (ngx_modules[i]->init_process(cycle) == NGX_ERROR) {
- /* fatal */
- exit(2);
- }
- }
- }
-
- for (n = 0; n < ngx_last_process; n++) {
-
- if (ngx_processes[n].pid == -1) {
- continue;
- }
-
- if (n == ngx_process_slot) {
- continue;
- }
-
- if (ngx_processes[n].channel[1] == -1) {
- continue;
- }
-
- if (close(ngx_processes[n].channel[1]) == -1) {
- ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
- "close() failed");
- }
- }
-
- if (close(ngx_processes[ngx_process_slot].channel[0]) == -1) {
- ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
- "close() failed");
- }
-
-#if 0
- ngx_last_process = 0;
-#endif
-
- if (ngx_add_channel_event(cycle, ngx_channel, NGX_READ_EVENT,
- ngx_channel_handler) == NGX_ERROR)
- {
- /* fatal */
- exit(2);
- }
+ ngx_worker_process_init(cycle);
ngx_setproctitle("worker process");
@@ -772,12 +712,129 @@
}
+static void ngx_worker_process_init(ngx_cycle_t *cycle)
+{
+ sigset_t set;
+ ngx_int_t n;
+ ngx_uint_t i;
+ struct timeval tv;
+ ngx_core_conf_t *ccf;
+ ngx_listening_t *ls;
+
+ ngx_gettimeofday(&tv);
+
+ ngx_start_msec = (ngx_epoch_msec_t) tv.tv_sec * 1000 + tv.tv_usec / 1000;
+ ngx_old_elapsed_msec = 0;
+ ngx_elapsed_msec = 0;
+
+
+ ngx_process = NGX_PROCESS_WORKER;
+
+ ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+
+ if (geteuid() == 0) {
+ if (setgid(ccf->group) == -1) {
+ ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+ "setgid(%d) failed", ccf->group);
+ /* fatal */
+ exit(2);
+ }
+
+ if (setuid(ccf->user) == -1) {
+ ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+ "setuid(%d) failed", ccf->user);
+ /* fatal */
+ exit(2);
+ }
+ }
+
+#if (NGX_HAVE_PR_SET_DUMPABLE)
+
+ /* allow coredump after setuid() in Linux 2.4.x */
+
+ if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) {
+ ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+ "prctl(PR_SET_DUMPABLE) failed");
+ }
+
+#endif
+
+ sigemptyset(&set);
+
+ if (sigprocmask(SIG_SETMASK, &set, NULL) == -1) {
+ ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+ "sigprocmask() failed");
+ }
+
+ ngx_init_temp_number();
+
+ /*
+ * disable deleting previous events for the listening sockets because
+ * in the worker processes there are no events at all at this point
+ */
+ ls = cycle->listening.elts;
+ for (i = 0; i < cycle->listening.nelts; i++) {
+ ls[i].remain = 0;
+ }
+
+ for (i = 0; ngx_modules[i]; i++) {
+ if (ngx_modules[i]->init_process) {
+ if (ngx_modules[i]->init_process(cycle) == NGX_ERROR) {
+ /* fatal */
+ exit(2);
+ }
+ }
+ }
+
+ for (n = 0; n < ngx_last_process; n++) {
+
+ if (ngx_processes[n].pid == -1) {
+ continue;
+ }
+
+ if (n == ngx_process_slot) {
+ continue;
+ }
+
+ if (ngx_processes[n].channel[1] == -1) {
+ continue;
+ }
+
+ if (close(ngx_processes[n].channel[1]) == -1) {
+ ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+ "close() channel failed");
+ }
+ }
+
+ if (close(ngx_processes[ngx_process_slot].channel[0]) == -1) {
+ ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+ "close() channel failed");
+ }
+
+#if 0
+ ngx_last_process = 0;
+#endif
+
+ if (ngx_add_channel_event(cycle, ngx_channel, NGX_READ_EVENT,
+ ngx_channel_handler) == NGX_ERROR)
+ {
+ /* fatal */
+ exit(2);
+ }
+}
+
+
static void ngx_channel_handler(ngx_event_t *ev)
{
ngx_int_t n;
ngx_channel_t ch;
ngx_connection_t *c;
+ if (ev->timedout) {
+ ev->timedout = 0;
+ return;
+ }
+
c = ev->data;
ngx_log_debug0(NGX_LOG_DEBUG_CORE, ev->log, 0, "channel handler");
@@ -834,7 +891,8 @@
ngx_processes[ch.slot].channel[0]);
if (close(ngx_processes[ch.slot].channel[0]) == -1) {
- ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno, "close() failed");
+ ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
+ "close() channel failed");
}
ngx_processes[ch.slot].channel[0] = -1;
@@ -896,7 +954,6 @@
ngx_err_t err;
ngx_core_tls_t *tls;
ngx_cycle_t *cycle;
- struct timeval tv;
thr->cv->tid = ngx_thread_self();
@@ -972,3 +1029,51 @@
}
#endif
+
+
+static void ngx_garbage_collector_cycle(ngx_cycle_t *cycle, void *data)
+{
+ ngx_uint_t i;
+ ngx_gc_t ctx;
+ ngx_path_t **path;
+ ngx_event_t *ev;
+
+ ngx_worker_process_init(cycle);
+
+ ev = &cycle->read_events[ngx_channel];
+
+ ngx_accept_mutex = NULL;
+
+ ngx_setproctitle("garbage collector");
+
+#if 0
+ ngx_add_timer(ev, 60 * 1000);
+#endif
+
+ for ( ;; ) {
+
+ if (ngx_terminate || ngx_quit) {
+ ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "exiting");
+ exit(0);
+ }
+
+ if (ngx_reopen) {
+ ngx_reopen = 0;
+ ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "reopen logs");
+ ngx_reopen_files(cycle, -1);
+ }
+
+ path = cycle->pathes.elts;
+ for (i = 0; i < cycle->pathes.nelts; i++) {
+ ctx.path = path[i];
+ ctx.log = cycle->log;
+ ctx.handler = path[i]->gc_handler;
+
+ ngx_collect_garbage(&ctx, &path[i]->name, 0);
+ }
+
+ ngx_add_timer(ev, 60 * 60 * 1000);
+
+ ngx_process_events(cycle);
+ }
+}
diff --git a/src/os/unix/ngx_shared.c b/src/os/unix/ngx_shared.c
index 7f3c5e9..0edc8cb 100644
--- a/src/os/unix/ngx_shared.c
+++ b/src/os/unix/ngx_shared.c
@@ -36,7 +36,7 @@
if (fd == -1) {
ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
- "open(/dev/zero) failed");
+ "open(\"/dev/zero\") failed");
return NULL;
}
@@ -49,7 +49,8 @@
}
if (close(fd) == -1) {
- ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "close() failed");
+ ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+ "close(\"/dev/zero\") failed");
}
return p;
diff --git a/src/os/unix/ngx_solaris_config.h b/src/os/unix/ngx_solaris_config.h
index 5d94cdc..8f18417 100644
--- a/src/os/unix/ngx_solaris_config.h
+++ b/src/os/unix/ngx_solaris_config.h
@@ -49,14 +49,6 @@
#include <ngx_auto_config.h>
-#ifndef HAVE_SELECT
-#define HAVE_SELECT 1
-#endif
-
-
-#ifndef HAVE_POLL
-#define HAVE_POLL 1
-#endif
#if (HAVE_POLL)
#include <poll.h>
#endif
diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h
index 0ead0d8..a6acf59 100644
--- a/src/os/unix/ngx_time.h
+++ b/src/os/unix/ngx_time.h
@@ -57,6 +57,7 @@
#define ngx_gettimeofday(tp) gettimeofday(tp, NULL);
#define ngx_msleep(ms) usleep(ms * 1000)
+#define ngx_sleep(s) sleep(s)
#endif /* _NGX_TIME_H_INCLUDED_ */
diff --git a/src/os/win32/nginx.ico b/src/os/win32/nginx.ico
index 6fb330b..af53a96 100644
--- a/src/os/win32/nginx.ico
+++ b/src/os/win32/nginx.ico
Binary files differ
diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h
index 863dce8..371b729 100644
--- a/src/os/win32/ngx_errno.h
+++ b/src/os/win32/ngx_errno.h
@@ -21,7 +21,10 @@
#define NGX_ENOENT ERROR_FILE_NOT_FOUND
#define NGX_EACCES ERROR_ACCESS_DENIED
+#if 0
#define NGX_EEXIST ERROR_FILE_EXISTS
+#endif
+#define NGX_EEXIST ERROR_ALREADY_EXISTS
#define NGX_ENOTDIR ERROR_PATH_NOT_FOUND
#define NGX_EPIPE EPIPE
#define NGX_EAGAIN WSAEWOULDBLOCK
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index ffd52c9..00d6bbc 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -171,7 +171,8 @@
}
-int ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool)
+ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to,
+ ngx_pool_t *pool)
{
int rc, collision;
u_int num;
@@ -229,7 +230,7 @@
#if 0
-int ngx_file_info(char *file, ngx_file_info_t *sb)
+ngx_int_t ngx_file_info(char *file, ngx_file_info_t *sb)
{
WIN32_FILE_ATTRIBUTE_DATA fa;
@@ -252,7 +253,7 @@
#endif
-int ngx_file_info(u_char *file, ngx_file_info_t *sb)
+ngx_int_t ngx_file_info(u_char *file, ngx_file_info_t *sb)
{
/* Win95 */
@@ -266,7 +267,7 @@
}
-int ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
+ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir)
{
ngx_cpystrn(name->data + name->len, NGX_DIR_MASK, NGX_DIR_MASK_LEN + 1);
@@ -283,7 +284,7 @@
}
-int ngx_read_dir(ngx_dir_t *dir)
+ngx_int_t ngx_read_dir(ngx_dir_t *dir)
{
if (dir->ready) {
dir->ready = 0;
@@ -298,13 +299,25 @@
}
-int ngx_file_append_mode(ngx_fd_t fd)
+ngx_int_t ngx_file_append_mode(ngx_fd_t fd)
{
+#if 0
+ if (LockFile(fd, 0, 0, 0xffffffff, 0xffffffff) == 0) {
+ return NGX_ERROR;
+ }
+#endif
+
if (SetFilePointer(fd, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) {
if (ngx_errno != NO_ERROR) {
return NGX_ERROR;
}
}
+#if 0
+ if (UnlockFile(fd, 0, 0, 0xffffffff, 0xffffffff) == 0) {
+ return NGX_ERROR;
+ }
+#endif
+
return NGX_OK;
}
diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h
index 6d60315..af0892a 100644
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -44,7 +44,7 @@
#define NGX_FILE_APPEND 0
-int ngx_file_append_mode(ngx_fd_t fd);
+ngx_int_t ngx_file_append_mode(ngx_fd_t fd);
#define ngx_file_append_mode_n "SetFilePointer()"
@@ -71,10 +71,11 @@
#define ngx_rename_file MoveFile
#define ngx_rename_file_n "MoveFile()"
-int ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool);
+ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to,
+ ngx_pool_t *pool);
-int ngx_file_info(u_char *filename, ngx_file_info_t *fi);
+ngx_int_t ngx_file_info(u_char *filename, ngx_file_info_t *fi);
#define ngx_file_info_n "GetFileAttributesEx()"
@@ -109,11 +110,11 @@
#define NGX_DIR_MASK_LEN 2
-int ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
+ngx_int_t ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir);
#define ngx_open_dir_n "FindFirstFile()"
-int ngx_read_dir(ngx_dir_t *dir);
+ngx_int_t ngx_read_dir(ngx_dir_t *dir);
#define ngx_read_dir_n "FindNextFile()"
diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h
index d49ad2c..8875288 100644
--- a/src/os/win32/ngx_socket.h
+++ b/src/os/win32/ngx_socket.h
@@ -98,7 +98,7 @@
extern LPFN_TRANSMITFILE transmitfile;
-ngx_inline static int ngx_tcp_push(ngx_socket_t s) {
+static ngx_inline int ngx_tcp_push(ngx_socket_t s) {
return 0;
}
diff --git a/src/os/win32/tray.ico b/src/os/win32/tray.ico
index 077cbac..b39e524 100644
--- a/src/os/win32/tray.ico
+++ b/src/os/win32/tray.ico
Binary files differ
