diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-12-16 15:07:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-12-16 15:07:08 +0000 |
| commit | 2402502c2f35b831ee89369a532b1ff4e4e19947 (patch) | |
| tree | 37fb834956f497f8b2d2862c6c3514e1a25bfb37 /auto/os | |
| parent | 74297c285ef173784cac505fd406267ac7c8d3c7 (diff) | |
| download | nginx-release-0.3.16.tar.gz nginx-release-0.3.16.tar.bz2 | |
nginx-0.3.16-RELEASE importrelease-0.3.16
*) Feature: the ngx_http_map_module.
*) Feature: the "types_hash_max_size" and "types_hash_bucket_size"
directives.
*) Feature: the "ssi_value_length" directive.
*) Feature: the "worker_rlimit_core" directive.
*) Workaround: the connection number in logs was always 1 if nginx was
built by the icc 8.1 or 9.0 compilers with optimization for
Pentium 4.
*) Bugfix: the "config timefmt" SSI command set incorrect time format.
*) Bugfix: nginx did not close connection to IMAP/POP3 backend for the
SSL connections; the bug had appeared in 0.3.13.
Thanks to Rob Mueller.
*) Bugfix: segmentation fault may occurred in at SSL shutdown; the bug
had appeared in 0.3.13.
Diffstat (limited to 'auto/os')
| -rw-r--r-- | auto/os/conf | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/auto/os/conf b/auto/os/conf index f4ba388e1..0ddbacbee 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -59,12 +59,36 @@ esac case "$NGX_MACHINE" in - i386 | i686 | i86pc | amd64) + i386 | i686 | i86pc) have=NGX_HAVE_NONALIGNED . auto/have + NGX_MACH_CACHE_LINE=32 ;; - sun4u | sparc | sparc64 | ia64 ) + amd64) + have=NGX_HAVE_NONALIGNED . auto/have + NGX_MACH_CACHE_LINE=64 + ;; + + sun4u | sparc | sparc64) + have=NGX_ALIGNMENT value=16 . auto/define + # TODO + NGX_MACH_CACHE_LINE=64 + ;; + + ia64 ) have=NGX_ALIGNMENT value=16 . auto/define + # TODO + NGX_MACH_CACHE_LINE=64 + ;; + + *) + NGX_MACH_CACHE_LINE=32 ;; esac + +if test -z "$NGX_CPU_CACHE_LINE"; then + NGX_CPU_CACHE_LINE=$NGX_MACH_CACHE_LINE +fi + +have=NGX_CPU_CACHE_LINE value=$NGX_CPU_CACHE_LINE . auto/define |