From a257367813cc604e9a8012cb64936a96b3a169cc Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 5 Oct 2005 14:46:21 +0000
Subject: nginx-0.2.6-RELEASE import

    *) Change: while using load-balancing the time before the failed
       backend retry was decreased from 60 to 10 seconds.

    *) Change: the "proxy_pass_unparsed_uri" was canceled, the original URI
       now passed, if the URI part is omitted in "proxy_pass" directive.

    *) Feature: the "error_page" directive supports redirects and allows
       more flexible to change an error code.

    *) Change: the charset in the "Content-Type" header line now is ignored
       in proxied subrequests.

    *) Bugfix: if the URI was changed in the "if" block and request did not
       found new configuration, then the ngx_http_rewrite_module rules ran
       again.

    *) Bugfix: if the "set" directive set the ngx_http_geo_module variable
       in some configuration part, the this variable was not available in
       other configuration parts and the "using uninitialized variable"
       error was occurred; the bug had appeared in 0.2.2.
---
 auto/cc/icc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'auto/cc')

diff --git a/auto/cc/icc b/auto/cc/icc
index b82a17d62..f58f5809a 100644
--- a/auto/cc/icc
+++ b/auto/cc/icc
@@ -90,9 +90,11 @@ CFLAGS="$CFLAGS -wd981"
 CFLAGS="$CFLAGS -wd1418"
 # external declaration in primary source file
 CFLAGS="$CFLAGS -wd1419"
+# explicit conversion of a 64-bit integral type to a smaller integral type
+CFLAGS="$CFLAGS -wd1683"
 
 case "$NGX_ICC_VER" in
-    8.*)
+    8.* | 9.*)
         # "cc" clobber ignored, warnings for Liunx's htons()
         CFLAGS="$CFLAGS -wd1469"
 
-- 
cgit