aboutsummaryrefslogtreecommitdiff
path: root/src/os/win32
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-01-25 12:27:35 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-01-25 12:27:35 +0000
commite5a222c6fef26b51d956c35530178837c60bf8c4 (patch)
tree65dafe2f85fe2b09b82d3efd2abe2b43720a1f4e /src/os/win32
parent4f06a9709164123e7d8ccbd6fa723da387a9a86c (diff)
downloadnginx-release-0.1.16.tar.gz
nginx-release-0.1.16.zip
nginx-0.1.16-RELEASE importrelease-0.1.16
*) Bugfix: if the response were transferred by chunks, then on the HEAD request the final chunk was issued. *) Bugfix: the "Connection: keep-alive" header were issued, even if the keepalive_timeout directive forbade the keep-alive use. *) Bugfix: the errors in the ngx_http_fastcgi_module caused the segmentation faults. *) Bugfix: the compressed response encrypted by SSL may not transferred complete. *) Bugfix: the TCP-specific TCP_NODELAY, TCP_NOPSUH, and TCP_CORK options, are not used for the unix domain sockets. *) Feature: the rewrite directive supports the arguments rewriting. *) Bugfix: the response code 400 was returned for the POST request with the "Content-Length: 0" header; the bug had appeared in 0.1.14.
Diffstat (limited to 'src/os/win32')
-rw-r--r--src/os/win32/nginx.rc4
-rw-r--r--src/os/win32/nginx_tray.ico (renamed from src/os/win32/tray.ico)bin198 -> 198 bytes
-rw-r--r--src/os/win32/ngx_gui.h6
-rw-r--r--src/os/win32/ngx_gui_resources.h19
4 files changed, 22 insertions, 7 deletions
diff --git a/src/os/win32/nginx.rc b/src/os/win32/nginx.rc
index 7a2e24133..fee869a24 100644
--- a/src/os/win32/nginx.rc
+++ b/src/os/win32/nginx.rc
@@ -1,10 +1,10 @@
// Copyright (C) Igor Sysoev
-#include <ngx_gui.h>
+#include <ngx_gui_resources.h>
nginx icon discardable "src\\os\\win32\\nginx.ico"
-tray icon discardable "src\\os\\win32\\tray.ico"
+tray icon discardable "src\\os\\win32\\nginx_tray.ico"
nginx menu discardable
begin
diff --git a/src/os/win32/tray.ico b/src/os/win32/nginx_tray.ico
index b39e5241c..b39e5241c 100644
--- a/src/os/win32/tray.ico
+++ b/src/os/win32/nginx_tray.ico
Binary files differ
diff --git a/src/os/win32/ngx_gui.h b/src/os/win32/ngx_gui.h
index 1c2fd9b43..e44e6aa15 100644
--- a/src/os/win32/ngx_gui.h
+++ b/src/os/win32/ngx_gui.h
@@ -10,11 +10,7 @@
#include <ngx_config.h>
#include <ngx_core.h>
-
-
-#define NGX_WM_TRAY WM_USER
-#define NGX_WM_EXIT WM_USER + 1
-#define NGX_WM_ABOUT WM_USER + 2
+#include <ngx_gui_resources.h>
void ngx_message_box(char *title, ngx_uint_t type, ngx_err_t err,
diff --git a/src/os/win32/ngx_gui_resources.h b/src/os/win32/ngx_gui_resources.h
new file mode 100644
index 000000000..cfbb00f1a
--- /dev/null
+++ b/src/os/win32/ngx_gui_resources.h
@@ -0,0 +1,19 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ */
+
+
+#ifndef _NGX_GUI_RESOURCES_H_INCLUDED_
+#define _NGX_GUI_RESOURCES_H_INCLUDED_
+
+
+#include <winuser.h>
+
+
+#define NGX_WM_TRAY WM_USER
+#define NGX_WM_EXIT WM_USER + 1
+#define NGX_WM_ABOUT WM_USER + 2
+
+
+#endif /* _NGX_GUI_RESOURCES_H_INCLUDED_ */