diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 15:07:03 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 15:07:03 +0000 |
| commit | 924bd79e317e9a137c0d1b9d349185758a628ec4 (patch) | |
| tree | f877c8b19e53e7d0a7683e3dd9aeb713146c4a8f /src/os/win32 | |
| parent | aef13d7f6660f4f8d2c50c95b8e182e62c115f88 (diff) | |
| download | nginx-release-0.1.1.tar.gz nginx-release-0.1.1.tar.bz2 | |
nginx-0.1.1-RELEASE importrelease-0.1.1
*) Feature: the gzip_types directive.
*) Feature: the tcp_nodelay directive.
*) Feature: the send_lowat directive is working not only on OSes that
support kqueue NOTE_LOWAT, but also on OSes that support SO_SNDLOWAT.
*) Feature: the setproctitle() emulation for Linux and Solaris.
*) Bugfix: the "Location" header rewrite bug fixed while the proxying.
*) Bugfix: the ngx_http_chunked_module module may get caught in an
endless loop.
*) Bugfix: the /dev/poll module bugs fixed.
*) Bugfix: the responses were corrupted when the temporary files were
used while the proxying.
*) Bugfix: the unescaped requests were passed to the backend.
*) Bugfix: while the build configuration on Linux 2.4 the
--with-poll_module parameter was required.
Diffstat (limited to '')
| -rw-r--r-- | src/os/win32/ngx_process.c | 5 | ||||
| -rw-r--r-- | src/os/win32/ngx_process.h | 5 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.h | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/os/win32/ngx_process.c b/src/os/win32/ngx_process.c index 7ec46f64c..062c41c8a 100644 --- a/src/os/win32/ngx_process.c +++ b/src/os/win32/ngx_process.c @@ -8,6 +8,11 @@ #include <ngx_core.h> +int ngx_argc; +char **ngx_argv; +char **ngx_os_argv; + + ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx) { return /* STUB */ 0; diff --git a/src/os/win32/ngx_process.h b/src/os/win32/ngx_process.h index 402f31ffb..b9b4aeb80 100644 --- a/src/os/win32/ngx_process.h +++ b/src/os/win32/ngx_process.h @@ -32,8 +32,11 @@ ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx); #define ngx_sched_yield() Sleep(0) +extern int ngx_argc; +extern char **ngx_argv; +extern char **ngx_os_argv; -extern ngx_pid_t ngx_pid; +extern ngx_pid_t ngx_pid; #endif /* _NGX_PROCESS_H_INCLUDED_ */ diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index d59717409..843c3111e 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -38,7 +38,7 @@ sig_atomic_t ngx_change_binary; -void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) +void ngx_master_process_cycle(ngx_cycle_t *cycle) { ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "master mode is not supported"); @@ -46,7 +46,7 @@ void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) } -void ngx_single_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) +void ngx_single_process_cycle(ngx_cycle_t *cycle) { ngx_int_t i; diff --git a/src/os/win32/ngx_process_cycle.h b/src/os/win32/ngx_process_cycle.h index 10d6850a7..e80af0a2f 100644 --- a/src/os/win32/ngx_process_cycle.h +++ b/src/os/win32/ngx_process_cycle.h @@ -12,21 +12,13 @@ #include <ngx_core.h> -typedef struct { - ngx_file_t pid; - u_char *name; - int argc; - char *const *argv; -} ngx_master_ctx_t; - - #define NGX_PROCESS_SINGLE 0 #define NGX_PROCESS_MASTER 1 #define NGX_PROCESS_WORKER 2 -void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx); -void ngx_single_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx); +void ngx_master_process_cycle(ngx_cycle_t *cycle); +void ngx_single_process_cycle(ngx_cycle_t *cycle); extern ngx_uint_t ngx_process; |
