mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Configure: fixed --without_http.

Browse Source 
Instead of turning off some randomly selected http modules
when --without-http is specified, just don't process the
whole http modules section.
This commit is contained in:
Ruslan Ermilov 2017-03-16 20:38:31 +03:00
parent 99e20ba5f9
commit 435670165a
2 changed files with 823 additions and 839 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
auto/modules
View File

@ -56,6 +56,7 @@ if [ $NGX_TEST_BUILD_SOLARIS_SENDFILEV = YES ]; then
fi fi
if [ $HTTP = YES ]; then
HTTP_MODULES= HTTP_MODULES=
HTTP_DEPS= HTTP_DEPS=
HTTP_INCS= HTTP_INCS=
@ -95,12 +96,6 @@ if :; then
fi fi
if [ $HTTP != YES ]; then
have=NGX_CRYPT . auto/nohave
CRYPT_LIB=
fi
if [ $HTTP_CACHE = YES ]; then if [ $HTTP_CACHE = YES ]; then
have=NGX_HTTP_CACHE . auto/have have=NGX_HTTP_CACHE . auto/have
HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS" HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS"
@ -428,7 +423,8 @@ if [ $HTTP_V2 = YES ]; then
ngx_module_name=ngx_http_v2_module ngx_module_name=ngx_http_v2_module
ngx_module_incs=src/http/v2 ngx_module_incs=src/http/v2
ngx_module_deps="src/http/v2/ngx_http_v2.h src/http/v2/ngx_http_v2_module.h" ngx_module_deps="src/http/v2/ngx_http_v2.h \
src/http/v2/ngx_http_v2_module.h"
ngx_module_srcs="src/http/v2/ngx_http_v2.c \ ngx_module_srcs="src/http/v2/ngx_http_v2.c \
src/http/v2/ngx_http_v2_table.c \ src/http/v2/ngx_http_v2_table.c \
src/http/v2/ngx_http_v2_huff_decode.c \ src/http/v2/ngx_http_v2_huff_decode.c \
@ -883,6 +879,7 @@ if [ $HTTP_STUB_STATUS = YES ]; then
. auto/module . auto/module
fi fi
fi
if [ $MAIL != NO ]; then if [ $MAIL != NO ]; then

13
auto/options
View File

@ -574,19 +574,6 @@ END
fi fi
if [ $HTTP = NO ]; then
HTTP_CHARSET=NO
HTTP_GZIP=NO
HTTP_SSI=NO
HTTP_USERID=NO
HTTP_ACCESS=NO
HTTP_STATUS=NO
HTTP_REWRITE=NO
HTTP_PROXY=NO
HTTP_FASTCGI=NO
fi
if [ ".$NGX_PLATFORM" = ".win32" ]; then if [ ".$NGX_PLATFORM" = ".win32" ]; then
NGX_WINE=$WINE NGX_WINE=$WINE
fi fi