comparison auto/cc/icc @ 644:ad25218fd14b NGINX_1_0_12

nginx 1.0.12 *) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the "ssl_protocols" directive. *) Feature: the "if" SSI command supports captures in regular expressions. *) Bugfix: the "if" SSI command did not work inside the "block" command. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "worker_cpu_affinity" directive might not work. *) Bugfix: the "limit_conn_log_level" and "limit_req_log_level" directives might not work. *) Bugfix: the "read_ahead" directive might not work combined with "try_files" and "open_file_cache". *) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter did not return answer from cache if there were no live upstreams. *) Bugfix: a segmentation fault might occur in a worker process if small time was used in the "inactive" parameter of the "proxy_cache_path" directive. *) Bugfix: responses from cache might hang. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in the "epoll" event method. Thanks to Yichun Zhang. *) Bugfix: the $sent_http_cache_control variable might contain a wrong value if the "expires" directive was used. Thanks to Yichun Zhang. *) Bugfix: the "limit_rate" directive did not allow to use full throughput, even if limit value was very high. *) Bugfix: the "sendfile_max_chunk" directive did not work, if the "limit_rate" directive was used. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.0.11. *) Bugfix: in the ngx_http_scgi_module. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Mon, 06 Feb 2012 00:00:00 +0400
parents 2ceaee987f37
children
comparison
equal deleted inserted replaced
643:d81e1c257a02 644:ad25218fd14b
1 1
2 # Copyright (C) Igor Sysoev 2 # Copyright (C) Igor Sysoev
3 # Copyright (C) Nginx, Inc.
3 4
4 5
5 # Intel C++ compiler 7.1, 8.0, 8.1, 9.0 6 # Intel C++ compiler 7.1, 8.0, 8.1, 9.0, 11.1
6 7
7 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \ 8 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
8 | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'` 9 | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'`
9 10
10 echo " + icc version: $NGX_ICC_VER" 11 echo " + icc version: $NGX_ICC_VER"
13 14
14 15
15 # optimizations 16 # optimizations
16 17
17 CFLAGS="$CFLAGS -O" 18 CFLAGS="$CFLAGS -O"
18 # inline the functions declared with __inline
19 #CFLAGS="$CFLAGS -Ob1"
20 # inline any function, at the compiler's discretion
21 CFLAGS="$CFLAGS -Ob2"
22 19
23 # multi-file IP optimizations
24 case "$NGX_ICC_VER" in
25 9.*)
26 IPO="-ipo"
27 ;;
28
29 # 8.1.38 under FreeBSD can not link -ipo
30 8.1)
31 IPO="-ip"
32 ;;
33
34 *)
35 IPO="-ipo -ipo_obj"
36 ;;
37 esac
38
39 # single-file IP optimizations
40 #IPO="-ip"
41
42 CFLAGS="$CFLAGS $IPO"
43 CORE_LINK="$CORE_LINK $IPO"
44 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file" 20 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file"
45 21
46 22
47 case $CPU in 23 case $CPU in
48 pentium) 24 pentium)
62 esac 38 esac
63 39
64 CFLAGS="$CFLAGS $CPU_OPT" 40 CFLAGS="$CFLAGS $CPU_OPT"
65 41
66 if [ ".$PCRE_OPT" = "." ]; then 42 if [ ".$PCRE_OPT" = "." ]; then
67 PCRE_OPT="-O $IPO $CPU_OPT" 43 PCRE_OPT="-O $CPU_OPT"
68 fi 44 fi
69 45
70 if [ ".$MD5_OPT" = "." ]; then 46 if [ ".$MD5_OPT" = "." ]; then
71 MD5_OPT="-O $IPO $CPU_OPT" 47 MD5_OPT="-O $CPU_OPT"
72 fi 48 fi
73 49
74 if [ ".$ZLIB_OPT" = "." ]; then 50 if [ ".$ZLIB_OPT" = "." ]; then
75 ZLIB_OPT="-O $IPO $CPU_OPT" 51 ZLIB_OPT="-O $CPU_OPT"
76 fi 52 fi
77 53
78 54
79 # warnings 55 # warnings
80 56