IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 23:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Win32: properly enabled select on Windows.

Browse Source 
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.
This commit is contained in:
Maxim Dounin 2019-01-24 21:51:00 +03:00
parent 3dcad9c5d6
commit c6a0003af1
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
auto/os/win32
View File

@ -34,6 +34,7 @@ EVENT_MODULES="$EVENT_MODULES $IOCP_MODULE"
EVENT_FOUND=YES EVENT_FOUND=YES
if [ $EVENT_SELECT = NO ]; then if [ $EVENT_SELECT = NO ]; then
have=NGX_HAVE_SELECT . auto/have
CORE_SRCS="$CORE_SRCS $SELECT_SRCS" CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE" EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
fi fi

1
misc/GNUmakefile
View File

@ -65,7 +65,6 @@ win32:
--with-cc-opt=-DFD_SETSIZE=1024 \ --with-cc-opt=-DFD_SETSIZE=1024 \
--with-pcre=$(OBJS)/lib/$(PCRE) \ --with-pcre=$(OBJS)/lib/$(PCRE) \
--with-zlib=$(OBJS)/lib/$(ZLIB) \ --with-zlib=$(OBJS)/lib/$(ZLIB) \
--with-select_module \
--with-http_v2_module \ --with-http_v2_module \
--with-http_realip_module \ --with-http_realip_module \
--with-http_addition_module \ --with-http_addition_module \