forked from nginx/nginx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS options in configure. *) Feature: the server_name directive supports *.domain.tld. *) Bugfix: the portability improvements. *) Bugfix: if configuration file was set in command line, the reconfiguration was impossible; the bug had appeared in 0.1.1. *) Bugfix: proxy module may get caught in an endless loop when sendfile is not used. *) Bugfix: with sendfile the response was not recoded according to the charset module directives; the bug had appeared in 0.1.1. *) Bugfix: very seldom bug in the kqueue processing. *) Bugfix: the gzip module compressed the proxied responses that was already compressed.
- Loading branch information
1 parent
ac64333
commit c0edbcc
Showing
106 changed files
with
2,504 additions
and
1,050 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
|
||
# Copyright (C) Igor Sysoev | ||
|
||
|
||
# Borland C++ 5.5 | ||
|
||
# optimizations | ||
|
||
# maximize speed | ||
CFLAGS="$CFLAGS -O2" | ||
|
||
case $CPU in | ||
pentium) | ||
# optimize for Pentium and Athlon | ||
CPU_OPT="-5" | ||
;; | ||
|
||
pentiumpro) | ||
# optimize for Pentium Pro, Pentium II and Pentium III | ||
CPU_OPT="-6" | ||
;; | ||
esac | ||
|
||
CFLAGS="$CFLAGS $CPU_OPT" | ||
|
||
# multithreaded | ||
CFLAGS="$CFLAGS -tWM" | ||
|
||
# stop on warning | ||
CFLAGS="$CFLAGS -w!" | ||
|
||
# disable logo | ||
CFLAGS="$CFLAGS -q" | ||
|
||
# precompiled headers | ||
CORE_DEPS="$CORE_DEPS $OBJS/ngx_config.csm" | ||
NGX_PCH="$OBJS/ngx_config.csm" | ||
NGX_BUILD_PCH="-H=$OBJS/ngx_config.csm" | ||
NGX_USE_PCH="-Hu -H=$OBJS/ngx_config.csm" | ||
|
||
LINK="\$(CC)" | ||
|
||
ngx_include_opt="-I" | ||
ngx_objout="-o" | ||
ngx_binout="-e" | ||
ngx_objext="obj" | ||
ngx_binext=".exe" | ||
ngx_dirsep='\\' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
|
||
# Copyright (C) Igor Sysoev | ||
|
||
|
||
ngx_include_opt="-I " | ||
ngx_compile_opt="-c" | ||
ngx_objout="-o " | ||
ngx_binout="-o " | ||
ngx_objext="o" | ||
ngx_binext= | ||
|
||
ngx_regex_dirsep="\/" | ||
ngx_dirsep='/' | ||
|
||
ngx_regex_cont=' \\\ | ||
' | ||
ngx_cont=' \ | ||
' | ||
ngx_tab=' \ | ||
' | ||
ngx_spacer= | ||
|
||
. auto/cc/name | ||
|
||
if test -n "$CFLAGS"; then | ||
|
||
CC_TEST_FLAGS="$CFLAGS $NGX_CC_OPT" | ||
|
||
case $NGX_CC_NAME in | ||
|
||
ccc) | ||
# Compaq C V6.5-207 | ||
|
||
ngx_include_opt="-I" | ||
;; | ||
|
||
esac | ||
|
||
else | ||
|
||
case $NGX_CC_NAME in | ||
gcc) | ||
# gcc 2.7.2.3, 2.8.1, 2.95.4, | ||
# 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4 | ||
|
||
. auto/cc/gcc | ||
;; | ||
|
||
icc) | ||
# Intel C++ compiler 7.1, 8.0 | ||
|
||
. auto/cc/icc | ||
;; | ||
|
||
# ccc) | ||
# # Compaq C V6.5-207 | ||
# | ||
# . auto/cc/ccc | ||
# ;; | ||
|
||
# acc) | ||
# # aCC: HP ANSI C++ B3910B A.03.55.02 | ||
# | ||
# . auto/cc/acc | ||
# ;; | ||
|
||
msvc) | ||
# MSVC 6.0 SP2 | ||
|
||
. auto/cc/msvc | ||
;; | ||
|
||
owc) | ||
# Open Watcom C 1.0, 1.2 | ||
|
||
. auto/cc/owc | ||
;; | ||
|
||
bcc) | ||
# Borland C++ 5.5 | ||
|
||
. auto/cc/bcc | ||
;; | ||
|
||
esac | ||
|
||
CC_TEST_FLAGS=$NGX_CC_OPT | ||
|
||
fi | ||
|
||
CFLAGS="$CFLAGS $NGX_CC_OPT" | ||
|
||
|
||
if [ "$PLATFORM" != win32 ]; then | ||
|
||
ngx_feature="gcc variadic macros" | ||
ngx_feature_name=HAVE_GCC_VARIADIC_MACROS | ||
ngx_feature_run=yes | ||
ngx_feature_incs="#include <stdio.h> | ||
#define var(dummy, args...) sprintf(args)" | ||
ngx_feature_libs= | ||
ngx_feature_test="char buf[30]; buf[0] = '0'; | ||
var(0, buf, \"%d\", 1); | ||
if (buf[0] != '1') return 1" | ||
. auto/feature | ||
|
||
|
||
ngx_feature="C99 variadic macros" | ||
ngx_feature_name=HAVE_C99_VARIADIC_MACROS | ||
ngx_feature_run=yes | ||
ngx_feature_incs="#include <stdio.h> | ||
#define var(dummy, ...) sprintf(__VA_ARGS__)" | ||
ngx_feature_libs= | ||
ngx_feature_test="char buf[30]; buf[0] = '0'; | ||
var(0, buf, \"%d\", 1); | ||
if (buf[0] != '1') return 1" | ||
. auto/feature | ||
|
||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
|
||
# Copyright (C) Igor Sysoev | ||
|
||
|
||
# gcc 2.7.2.3, 2.8.1, 2.95.4, | ||
# 3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4 | ||
|
||
|
||
# Solaris 7's /usr/ccs/bin/as does not support "-pipe" | ||
|
||
CC_TEST_FLAGS="-pipe" | ||
|
||
ngx_feature="gcc -pipe switch" | ||
ngx_feature_name= | ||
ngx_feature_run=no | ||
ngx_feature_incs= | ||
ngx_feature_libs= | ||
ngx_feature_test= | ||
. auto/feature | ||
|
||
CC_TEST_FLAGS= | ||
|
||
if [ $ngx_found = yes ]; then | ||
PIPE="-pipe" | ||
fi | ||
|
||
|
||
# optimizations | ||
|
||
#CFLAGS="$CFLAGS -O2 -fomit-frame-pointer" | ||
|
||
case $CPU in | ||
pentium) | ||
# optimize for Pentium and Athlon | ||
CPU_OPT="-march=pentium" | ||
;; | ||
|
||
pentiumpro) | ||
# optimize for Pentium Pro, Pentium II and Pentium III | ||
CPU_OPT="-march=pentiumpro" | ||
;; | ||
|
||
pentium4) | ||
# optimize for Pentium 4, gcc 3.x | ||
CPU_OPT="-march=pentium4" | ||
;; | ||
|
||
sparc64) | ||
# build 64-bit UltraSparc binary | ||
CPU_OPT="-m64" | ||
CORE_LINK="$CORE_LINK -m64" | ||
CC_AUX_FLAGS="$CC_AUX_FLAGS -m64" | ||
;; | ||
|
||
esac | ||
|
||
|
||
# STUB for batch builds | ||
if [ $CC = gcc27 ]; then CPU_OPT=; fi | ||
|
||
|
||
CFLAGS="$CFLAGS $PIPE $CPU_OPT" | ||
|
||
if [ ".$PCRE_OPT" = "." ]; then | ||
PCRE_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" | ||
else | ||
PCRE_OPT="$PCRE_OPT $PIPE" | ||
fi | ||
|
||
if [ ".$MD5_OPT" = "." ]; then | ||
MD5_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" | ||
else | ||
MD5_OPT="$MD5_OPT $PIPE" | ||
fi | ||
|
||
if [ ".$ZLIB_OPT" = "." ]; then | ||
ZLIB_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" | ||
else | ||
ZLIB_OPT="$ZLIB_OPT $PIPE" | ||
fi | ||
|
||
|
||
# warnings | ||
|
||
CFLAGS="$CFLAGS -O -W" | ||
CFLAGS="$CFLAGS -Wall -Wpointer-arith" | ||
#CFLAGS="$CFLAGS -Wconversion" | ||
#CFLAGS="$CFLAGS -Winline" | ||
|
||
# we have a lot of the unused function arguments | ||
CFLAGS="$CFLAGS -Wno-unused" | ||
|
||
# stop on warning | ||
CFLAGS="$CFLAGS -Werror" | ||
|
||
# debug | ||
CFLAGS="$CFLAGS -g" | ||
|
||
# DragonFly's gcc3 generates DWARF | ||
#CFLAGS="$CFLAGS -g -gstabs" | ||
|
||
if [ ".$CPP" = "." ]; then | ||
CPP="$CC -E" | ||
fi | ||
|
||
LINK="\$(CC)" | ||
|
||
|
||
CC_STRONG="-Wall -Werror" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
|
||
# Copyright (C) Igor Sysoev | ||
|
||
|
||
# Intel C++ compiler 7.1, 8.0 | ||
|
||
# optimizations | ||
|
||
CFLAGS="$CFLAGS -O" | ||
# inline functions declared with __inline | ||
#CFLAGS="$CFLAGS -Ob1" | ||
# inline any function, at the compiler's discretion | ||
CFLAGS="$CFLAGS -Ob2" | ||
|
||
# single-file IP optimizations | ||
#IPO="-ip" | ||
# multi-file IP optimizations | ||
IPO="-ipo -ipo_obj" | ||
CFLAGS="$CFLAGS $IPO" | ||
CORE_LINK="$CORE_LINK $IPO" | ||
CORE_LINK="$CORE_LINK -opt_report_file=$OBJS/opt_report_file" | ||
|
||
case $CPU in | ||
pentium) | ||
# optimize for Pentium and Athlon | ||
CPU_OPT="-march=pentium" | ||
;; | ||
|
||
pentiumpro) | ||
# optimize for Pentium Pro, Pentium II and Pentium III | ||
CPU_OPT="-mcpu=pentiumpro -march=pentiumpro" | ||
;; | ||
|
||
pentium4) | ||
# optimize for Pentium 4, default | ||
CPU_OPT="-march=pentium4" | ||
;; | ||
esac | ||
|
||
CFLAGS="$CFLAGS $CPU_OPT" | ||
|
||
if [ ".$PCRE_OPT" = "." ]; then | ||
PCRE_OPT="-O $IPO $CPU_OPT" | ||
fi | ||
|
||
if [ ".$MD5_OPT" = "." ]; then | ||
MD5_OPT="-O $IPO $CPU_OPT" | ||
fi | ||
|
||
if [ ".$ZLIB_OPT" = "." ]; then | ||
ZLIB_OPT="-O $IPO $CPU_OPT" | ||
fi | ||
|
||
|
||
# warnings | ||
|
||
CFLAGS="$CFLAGS -w1" | ||
#CFLAGS="$CFLAGS -w2" | ||
|
||
# stop on warning | ||
CFLAGS="$CFLAGS -Werror" | ||
|
||
# debug | ||
CFLAGS="$CFLAGS -g" | ||
|
||
LINK="\$(CC)" | ||
|
||
|
||
CC_STRONG="-w1 -Werror" |
Oops, something went wrong.