From 2402502c2f35b831ee89369a532b1ff4e4e19947 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 16 Dec 2005 15:07:08 +0000
Subject: nginx-0.3.16-RELEASE import

    *) 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.
---
 auto/cc/gcc | 7 +++++++
 auto/cc/icc | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'auto/cc')

diff --git a/auto/cc/gcc b/auto/cc/gcc
index 9e0e52d9e..5c5f61cd8 100644
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -58,26 +58,31 @@ case $CPU in
     pentium)
         # optimize for Pentium and Athlon
         CPU_OPT="-march=pentium"
+        NGX_CPU_CACHE_LINE=32
     ;;
 
     pentiumpro | pentium3)
         # optimize for Pentium Pro, Pentium II and Pentium III
         CPU_OPT="-march=pentiumpro"
+        NGX_CPU_CACHE_LINE=32
     ;;
 
     pentium4)
         # optimize for Pentium 4, gcc 3.x
         CPU_OPT="-march=pentium4"
+        NGX_CPU_CACHE_LINE=128
     ;;
 
     athlon)
         # optimize for Athlon, gcc 3.x
         CPU_OPT="-march=athlon"
+        NGX_CPU_CACHE_LINE=64
     ;;
 
     opteron)
         # optimize for Opteron, gcc 3.x
         CPU_OPT="-march=opteron"
+        NGX_CPU_CACHE_LINE=64
     ;;
 
     sparc32)
@@ -85,6 +90,7 @@ case $CPU in
         CPU_OPT="-m32"
         CORE_LINK="$CORE_LINK -m32"
         CC_AUX_FLAGS="$CC_AUX_FLAGS -m32"
+        NGX_CPU_CACHE_LINE=64
     ;;
 
     sparc64)
@@ -92,6 +98,7 @@ case $CPU in
         CPU_OPT="-m64"
         CORE_LINK="$CORE_LINK -m64"
         CC_AUX_FLAGS="$CC_AUX_FLAGS -m64"
+        NGX_CPU_CACHE_LINE=64
     ;;
 
 esac
diff --git a/auto/cc/icc b/auto/cc/icc
index 16cb2bb42..1a4111b93 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -2,7 +2,7 @@
 # Copyright (C) Igor Sysoev
 
 
-# Intel C++ compiler 7.1, 8.0, 8.1
+# Intel C++ compiler 7.1, 8.0, 8.1, 9.0
 
 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
                          | sed -e 's/^.* Version \(.*\)   Build.*$/\1/'`
-- 
cgit