summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-10-05 14:46:21 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-10-05 14:46:21 +0000
commita257367813cc604e9a8012cb64936a96b3a169cc (patch)
treef85d61c240f4d0ec775e6fb68709a902b9137111 /auto
parentc6806be34feef0bb4a9611338ed3a0b6f886111c (diff)
downloadnginx-a257367813cc604e9a8012cb64936a96b3a169cc.tar.gz
nginx-a257367813cc604e9a8012cb64936a96b3a169cc.tar.bz2
nginx-0.2.6-RELEASE importrelease-0.2.6
*) 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.
Diffstat (limited to 'auto')
-rw-r--r--auto/cc/icc4
1 files changed, 3 insertions, 1 deletions
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"