aboutsummaryrefslogtreecommitdiff
path: root/src/os/win32/ngx_process_cycle.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-05-12 14:58:06 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-05-12 14:58:06 +0000
commit899b44eab259f32af5c6e3da342f430c654528ce (patch)
tree23fb5dfbc9219030f9e102db5a2ce44e98c0a9d0 /src/os/win32/ngx_process_cycle.c
parent22157ce9d570452b2d77f0fe7e510e6b0e4d05c2 (diff)
downloadnginx-release-0.1.29.tar.gz
nginx-release-0.1.29.zip
nginx-0.1.29-RELEASE importrelease-0.1.29
*) Feature: the ngx_http_ssi_module supports "include virtual" command. *) Feature: the ngx_http_ssi_module supports the condition command like 'if expr="$NAME"' and "else" and "endif" commands. Only one nested level is supported. *) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and DATE_GMT variables and "config timefmt" command. *) Feature: the "ssi_ignore_recycled_buffers" directive. *) Bugfix: the "echo" command did not show the default value for the empty QUERY_STRING variable. *) Change: the ngx_http_proxy_module was rewritten. *) Feature: the "proxy_redirect", "proxy_pass_request_headers", "proxy_pass_request_body", and "proxy_method" directives. *) Feature: the "proxy_set_header" directive. The "proxy_x_var" was canceled and must be replaced with the proxy_set_header directive. *) Change: the "proxy_preserve_host" is canceled and must be replaced with the "proxy_set_header Host $host" and the "proxy_redirect off" directives, the "proxy_set_header Host $host:$proxy_port" directive and the appropriate proxy_redirect directives. *) Change: the "proxy_set_x_real_ip" is canceled and must be replaced with the "proxy_set_header X-Real-IP $remote_addr" directive. *) Change: the "proxy_add_x_forwarded_for" is canceled and must be replaced with the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for" directive. *) Change: the "proxy_set_x_url" is canceled and must be replaced with the "proxy_set_header X-URL http://$host:$server_port$request_uri" directive. *) Feature: the "fastcgi_param" directive. *) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params" directive are canceled and must be replaced with the fastcgi_param directives. *) Feature: the "index" directive can use the variables. *) Feature: the "index" directive can be used at http and server levels. *) Change: the last index only in the "index" directive can be absolute. *) Feature: the "rewrite" directive can use the variables. *) Feature: the "internal" directive. *) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR, SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME, REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables. *) Change: nginx now passes the invalid lines in a client request headers or a backend response header. *) Bugfix: if the backend did not transfer response for a long time and the "send_timeout" was less than "proxy_read_timeout", then nginx returned the 408 response. *) Bugfix: the segmentation fault was occurred if the backend sent an invalid line in response header; the bug had appeared in 0.1.26. *) Bugfix: the segmentation fault may occurred in FastCGI fault tolerance configuration. *) Bugfix: the "expires" directive did not remove the previous "Expires" and "Cache-Control" headers. *) Bugfix: nginx did not take into account trailing dot in "Host" header line. *) Bugfix: the ngx_http_auth_module did not work under Linux. *) Bugfix: the rewrite directive worked incorrectly, if the arguments were in a request. *) Bugfix: nginx could not be built on MacOS X.
Diffstat (limited to 'src/os/win32/ngx_process_cycle.c')
-rw-r--r--src/os/win32/ngx_process_cycle.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c
index 2251ff2df..7eabefe5c 100644
--- a/src/os/win32/ngx_process_cycle.c
+++ b/src/os/win32/ngx_process_cycle.c
@@ -12,7 +12,7 @@
static void *ngx_worker_thread_cycle(void *data);
static long __stdcall ngx_window_procedure(HWND window, u_int message,
- u_int wparam, long lparam);
+ u_int wparam, long lparam);
#if 0
ngx_pid_t ngx_new_binary;
@@ -45,7 +45,8 @@ sig_atomic_t ngx_change_binary;
static HMENU ngx_menu;
-void ngx_master_process_cycle(ngx_cycle_t *cycle)
+void
+ngx_master_process_cycle(ngx_cycle_t *cycle)
{
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "master mode is not supported");
@@ -53,7 +54,8 @@ void ngx_master_process_cycle(ngx_cycle_t *cycle)
}
-void ngx_single_process_cycle(ngx_cycle_t *cycle)
+void
+ngx_single_process_cycle(ngx_cycle_t *cycle)
{
int rc;
ngx_int_t i;
@@ -165,7 +167,7 @@ void ngx_single_process_cycle(ngx_cycle_t *cycle)
if (ngx_system_tray_icon(window, NIM_ADD, tray, (u_char *) " nginx")
- == NGX_ERROR)
+ != NGX_OK)
{
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
"Shell_NotifyIcon(NIM_ADD) failed");
@@ -200,7 +202,8 @@ void ngx_single_process_cycle(ngx_cycle_t *cycle)
}
-static void *ngx_worker_thread_cycle(void *data)
+static void *
+ngx_worker_thread_cycle(void *data)
{
ngx_cycle_t *cycle;
@@ -216,8 +219,8 @@ static void *ngx_worker_thread_cycle(void *data)
}
-static long __stdcall ngx_window_procedure(HWND window, u_int message,
- u_int wparam, long lparam)
+static long __stdcall
+ngx_window_procedure(HWND window, u_int message, u_int wparam, long lparam)
{
POINT mouse;
@@ -251,13 +254,13 @@ static long __stdcall ngx_window_procedure(HWND window, u_int message,
case WM_COMMAND:
if (wparam == NGX_WM_ABOUT) {
ngx_message_box("nginx", MB_OK, 0,
- NGINX_VER CRLF "(C) 2002-2004 Igor Sysoev");
+ NGINX_VER CRLF "(C) 2002-2005 Igor Sysoev");
return 0;
}
if (wparam == NGX_WM_EXIT) {
if (ngx_system_tray_icon(window, NIM_DELETE, NULL, NULL)
- == NGX_ERROR)
+ != NGX_OK)
{
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno,
"Shell_NotifyIcon(NIM_DELETE) failed");