[nginx] Win32: properly enabled select on Windows.

Maxim Dounin mdounin at mdounin.ru
Thu Jan 24 20:16:18 UTC 2019


details:   https://hg.nginx.org/nginx/rev/f3ff79ae31d9
branches:  
changeset: 7443:f3ff79ae31d9
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Thu Jan 24 21:51:00 2019 +0300
description:
Win32: properly enabled select on Windows.

Previously, select was compiled in by default, but the NGX_HAVE_SELECT
macro was not set, resulting in iocp being used by default unless
the "--with-select_module" configure option was explicitly specified.
Since the iocp module is not finished and does not work properly, this
effectively meant that the "--with-select_module" option was mandatory.

With the change NGX_HAVE_SELECT is properly set, making "--with-select_module"
optional.  Accordingly, it is removed from misc/GNUmakefile win32 target.

diffstat:

 auto/os/win32    |  1 +
 misc/GNUmakefile |  1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diffs (22 lines):

diff --git a/auto/os/win32 b/auto/os/win32
--- a/auto/os/win32
+++ b/auto/os/win32
@@ -34,6 +34,7 @@ EVENT_MODULES="$EVENT_MODULES $IOCP_MODU
 EVENT_FOUND=YES
 
 if [ $EVENT_SELECT = NO ]; then
+    have=NGX_HAVE_SELECT . auto/have
     CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
     EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
 fi
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -65,7 +65,6 @@ win32:
 		--with-cc-opt=-DFD_SETSIZE=1024				\
 		--with-pcre=$(OBJS)/lib/$(PCRE)				\
 		--with-zlib=$(OBJS)/lib/$(ZLIB)				\
-		--with-select_module					\
 		--with-http_v2_module					\
 		--with-http_realip_module				\
 		--with-http_addition_module				\


More information about the nginx-devel mailing list