diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-12-26 17:07:48 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-12-26 17:07:48 +0000 |
| commit | 305a9d83cfba0d0330bd12af4ca56943b10e958e (patch) | |
| tree | 8dc3ead91f77a4ae8953f289f57ff49b4ce9c9f1 /auto | |
| parent | f9cbecc16a9851e8403bf7dae96feebf63b1ac3e (diff) | |
| download | nginx-release-0.3.18.tar.gz nginx-release-0.3.18.zip | |
nginx-0.3.18-RELEASE importrelease-0.3.18
*) 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.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/lib/pcre/makefile.bcc | 2 | ||||
| -rw-r--r-- | auto/lib/zlib/makefile.bcc | 2 | ||||
| -rw-r--r-- | auto/make | 13 | ||||
| -rw-r--r-- | auto/os/conf | 2 | ||||
| -rw-r--r-- | auto/sources | 1 |
5 files changed, 16 insertions, 4 deletions
diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc index a2dc5fbfc..9fd821d64 100644 --- a/auto/lib/pcre/makefile.bcc +++ b/auto/lib/pcre/makefile.bcc @@ -2,7 +2,7 @@ # Copyright (C) Igor Sysoev -CFLAGS = -q -O2 -tWM $(CPU_OPT) +CFLAGS = -q -O2 -tWM -w-8004 $(CPU_OPT) PCREFLAGS = -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 diff --git a/auto/lib/zlib/makefile.bcc b/auto/lib/zlib/makefile.bcc index 2c764242c..2e7b71991 100644 --- a/auto/lib/zlib/makefile.bcc +++ b/auto/lib/zlib/makefile.bcc @@ -2,7 +2,7 @@ # Copyright (C) Igor Sysoev -CFLAGS = -q -O2 -tWM $(CPU_OPT) +CFLAGS = -q -O2 -tWM -w-8004 -w-8012 $(CPU_OPT) zlib.lib: bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \ @@ -320,6 +320,19 @@ END 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 diff --git a/auto/os/conf b/auto/os/conf index 0ddbacbee..16a3718c9 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -64,7 +64,7 @@ case "$NGX_MACHINE" in NGX_MACH_CACHE_LINE=32 ;; - amd64) + amd64 | x86_64) have=NGX_HAVE_NONALIGNED . auto/have NGX_MACH_CACHE_LINE=64 ;; diff --git a/auto/sources b/auto/sources index 5eacc1ae2..b59808313 100644 --- a/auto/sources +++ b/auto/sources @@ -266,7 +266,6 @@ HTTP_DEPS="src/http/ngx_http.h \ HTTP_SRCS="src/http/ngx_http.c \ src/http/ngx_http_core_module.c \ - src/http/ngx_http_config.c \ src/http/ngx_http_special_response.c \ src/http/ngx_http_request.c \ src/http/ngx_http_parse.c \ |