mirror of
https://github.com/nginx/nginx.git
synced 2024-11-26 19:00:16 -06:00
305a9d83cf
*) Feature: the "server_names" directive supports the ".domain.tld"
names.
*) Feature: the "server_names" directive uses the hash for the
"*.domain.tld" names and more effective hash for usual names.
*) Change: the "server_names_hash_max_size" and
"server_names_hash_bucket_size" directives.
*) Change: the "server_names_hash" and "server_names_hash_threshold"
directives were canceled.
*) Feature: the "valid_referers" directive uses the hash site names.
*) Change: now the "valid_referers" directive checks the site names
only without the URI part.
*) Bugfix: some ".domain.tld" names incorrectly processed by the
ngx_http_map_module.
*) Bugfix: segmentation fault was occurred if configuration file did
not exist; the bug had appeared in 0.3.12.
*) Bugfix: on 64-bit platforms segmentation fault may occurred on
start; the bug had appeared in 0.3.16.
374 lines
9.3 KiB
Plaintext
374 lines
9.3 KiB
Plaintext
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
|
|
$NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \
|
|
$NGX_OBJS/src/http $NGX_OBJS/src/http/modules \
|
|
$NGX_OBJS/src/http/modules/proxy \
|
|
$NGX_OBJS/src/imap
|
|
|
|
|
|
ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep
|
|
ngx_use_pch=`echo $NGX_USE_PCH | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
|
|
cat << END > $NGX_MAKEFILE
|
|
|
|
CC = $CC
|
|
CFLAGS = $CFLAGS
|
|
CPP = $CPP
|
|
LINK = $LINK
|
|
|
|
END
|
|
|
|
if [ "$CC" = wcl386 ]; then
|
|
echo MAKE = wmake >> $NGX_MAKEFILE
|
|
|
|
ngx_regex_cont=' '
|
|
ngx_long_regex_cont=' '
|
|
ngx_cont=' '
|
|
ngx_long_cont=' '
|
|
ngx_tab=' '
|
|
|
|
fi
|
|
|
|
|
|
# ALL_INCS, required by the addons and by OpenWatcom C precompiled headers
|
|
|
|
ngx_incs=`echo $CORE_INCS $NGX_OBJS $HTTP_INCS $IMAP_INCS\
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
ALL_INCS = $ngx_include_opt$ngx_incs
|
|
|
|
END
|
|
|
|
|
|
ngx_all_srcs="$CORE_SRCS"
|
|
|
|
|
|
# the core dependences and include pathes
|
|
|
|
ngx_deps=`echo $CORE_DEPS $NGX_AUTO_CONFIG_H $NGX_PCH \
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_incs=`echo $CORE_INCS $NGX_OBJS \
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
CORE_DEPS = $ngx_deps
|
|
|
|
|
|
CORE_INCS = $ngx_include_opt$ngx_incs
|
|
|
|
END
|
|
|
|
|
|
# the http dependences and include pathes
|
|
|
|
if [ $HTTP = YES ]; then
|
|
|
|
ngx_all_srcs="$ngx_all_srcs $HTTP_SRCS"
|
|
|
|
ngx_deps=`echo $HTTP_DEPS \
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_incs=`echo $HTTP_INCS \
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
HTTP_DEPS = $ngx_deps
|
|
|
|
|
|
HTTP_INCS = $ngx_include_opt$ngx_incs
|
|
|
|
END
|
|
|
|
fi
|
|
|
|
|
|
# the imap dependences and include pathes
|
|
|
|
if [ $IMAP = YES ]; then
|
|
|
|
ngx_all_srcs="$ngx_all_srcs $IMAP_SRCS"
|
|
|
|
ngx_deps=`echo $IMAP_DEPS \
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_incs=`echo $IMAP_INCS \
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont$ngx_include_opt\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
IMAP_DEPS = $ngx_deps
|
|
|
|
|
|
IMAP_INCS = $ngx_include_opt$ngx_incs
|
|
|
|
END
|
|
|
|
fi
|
|
|
|
|
|
if test -n "$NGX_ADDON_SRCS"; then
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
ADDON_DEPS = \$(CORE_DEPS) $NGX_ADDON_DEPS
|
|
|
|
END
|
|
|
|
fi
|
|
|
|
|
|
# nginx
|
|
|
|
ngx_all_srcs=`echo $ngx_all_srcs | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
for ngx_src in $NGX_ADDON_SRCS
|
|
do
|
|
ngx_obj="addon/`basename \`dirname $ngx_src\``"
|
|
|
|
test -d $NGX_OBJS/$ngx_obj || mkdir -p $NGX_OBJS/$ngx_obj
|
|
|
|
ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \
|
|
| sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_all_srcs="$ngx_all_srcs $ngx_obj"
|
|
done
|
|
|
|
ngx_all_objs=`echo $ngx_all_srcs \
|
|
| sed -e "s/\([^ ]*\.\)cpp/$NGX_OBJS\/\1$ngx_objext/g" \
|
|
-e "s/\([^ ]*\.\)cc/$NGX_OBJS\/\1$ngx_objext/g" \
|
|
-e "s/\([^ ]*\.\)c/$NGX_OBJS\/\1$ngx_objext/g" \
|
|
-e "s/\([^ ]*\.\)S/$NGX_OBJS\/\1$ngx_objext/g"`
|
|
|
|
ngx_modules_c=`echo $NGX_MODULES_C | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_modules_obj=`echo $ngx_modules_c | sed -e "s/\(.*\.\)c/\1$ngx_objext/"`
|
|
|
|
|
|
if test -n "$NGX_RES"; then
|
|
ngx_res=$NGX_RES
|
|
else
|
|
ngx_res="$NGX_RC $NGX_ICONS"
|
|
ngx_rcc=`echo $NGX_RCC | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
fi
|
|
|
|
ngx_deps=`echo $ngx_all_objs $ngx_modules_obj $ngx_res $LINK_DEPS \
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_regex_cont\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_objs=`echo $ngx_all_objs $ngx_modules_obj \
|
|
| sed -e "s/ *\([^ ][^ ]*\)/$ngx_long_regex_cont\1/g" \
|
|
-e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_libs=${CORE_LIBS:+`echo $NGX_LD_OPT $CORE_LIBS \
|
|
| sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`}
|
|
|
|
ngx_link=${CORE_LINK:+`echo $CORE_LINK \
|
|
| sed -e "s/\//$ngx_regex_dirsep/g" -e "s/^/$ngx_long_regex_cont/"`}
|
|
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$NGX_OBJS${ngx_dirsep}nginx${ngx_binext}: $ngx_deps$ngx_spacer
|
|
\$(LINK) ${ngx_long_start}${ngx_binout}$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link
|
|
$ngx_rcc
|
|
${ngx_long_end}
|
|
END
|
|
|
|
|
|
# ngx_modules.c
|
|
|
|
if test -n "$NGX_PCH"; then
|
|
ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
|
|
else
|
|
ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS)"
|
|
fi
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ngx_modules_obj: \$(CORE_DEPS)$ngx_cont$ngx_modules_c
|
|
$ngx_cc$ngx_tab$ngx_objout$ngx_modules_obj$ngx_tab$ngx_modules_c$NGX_AUX
|
|
|
|
END
|
|
|
|
|
|
# the core sources
|
|
|
|
for ngx_src in $CORE_SRCS
|
|
do
|
|
ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
ngx_obj=`echo $ngx_src \
|
|
| sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ngx_obj: \$(CORE_DEPS)$ngx_cont$ngx_src
|
|
$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
|
|
|
|
END
|
|
|
|
done
|
|
|
|
|
|
# the http sources
|
|
|
|
if [ $HTTP = YES ]; then
|
|
|
|
if test -n "$NGX_PCH"; then
|
|
ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
|
|
else
|
|
ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(HTTP_INCS)"
|
|
fi
|
|
|
|
for ngx_src in $HTTP_SRCS
|
|
do
|
|
ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
ngx_obj=`echo $ngx_src \
|
|
| sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ngx_obj: \$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src
|
|
$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
|
|
|
|
END
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
# the imap sources
|
|
|
|
if [ $IMAP = YES ]; then
|
|
|
|
if test -n "$NGX_PCH"; then
|
|
ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
|
|
else
|
|
ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) \$(CORE_INCS) \$(IMAP_INCS)"
|
|
fi
|
|
|
|
for ngx_src in $IMAP_SRCS
|
|
do
|
|
ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
ngx_obj=`echo $ngx_src \
|
|
| sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ngx_obj: \$(CORE_DEPS) \$(IMAP_DEPS)$ngx_cont$ngx_src
|
|
$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
|
|
|
|
END
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
# the addons sources
|
|
|
|
if test -n "$NGX_ADDON_SRCS"; then
|
|
|
|
ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)"
|
|
|
|
for ngx_src in $NGX_ADDON_SRCS
|
|
do
|
|
ngx_obj="addon/`basename \`dirname $ngx_src\``"
|
|
|
|
ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \
|
|
| sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_obj=`echo $ngx_obj \
|
|
| sed -e "s/^\(.*\.\)cpp$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)cc$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)c$/$ngx_objs_dir\1$ngx_objext/g" \
|
|
-e "s/^\(.*\.\)S$/$ngx_objs_dir\1$ngx_objext/g"`
|
|
|
|
ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ngx_obj: \$(ADDON_DEPS)$ngx_cont$ngx_src
|
|
$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX
|
|
|
|
END
|
|
done
|
|
|
|
fi
|
|
|
|
|
|
# the addons config.make
|
|
|
|
if test -n "$NGX_ADDONS"; then
|
|
|
|
for ngx_addon_dir in $NGX_ADDONS
|
|
do
|
|
if test -f $ngx_addon_dir/config.make; then
|
|
. $ngx_addon_dir/config.make
|
|
fi
|
|
done
|
|
fi
|
|
|
|
|
|
# Win32 resource file
|
|
|
|
if test -n "$NGX_RES"; then
|
|
|
|
ngx_res=`echo "$NGX_RES: $NGX_RC $NGX_ICONS" \
|
|
| sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
ngx_rcc=`echo $NGX_RCC | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ngx_res
|
|
$ngx_rcc
|
|
|
|
END
|
|
|
|
fi
|
|
|
|
|
|
# the precompiled headers
|
|
|
|
if test -n "$NGX_PCH"; then
|
|
echo "#include <ngx_config.h>" > $NGX_OBJS/ngx_pch.c
|
|
|
|
ngx_pch="src/core/ngx_config.h $OS_CONFIG $NGX_OBJS/ngx_auto_config.h"
|
|
ngx_pch=`echo "$NGX_PCH: $ngx_pch" | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
ngx_src="\$(CC) \$(CFLAGS) $NGX_BUILD_PCH $ngx_compile_opt \$(ALL_INCS)"
|
|
ngx_src="$ngx_src $ngx_objout$NGX_OBJS/ngx_pch.obj $NGX_OBJS/ngx_pch.c"
|
|
ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ngx_pch
|
|
$ngx_src
|
|
|
|
END
|
|
|
|
fi
|