annotate auto/lib/sha1/make @ 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 98143f74eb3d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
644
ad25218fd14b nginx 1.0.12
Igor Sysoev <http://sysoev.ru>
parents: 492
diff changeset
3 # Copyright (C) Nginx, Inc.
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6 case "$NGX_CC_NAME" in
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 msvc*)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 ngx_makefile=makefile.msvc
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM"
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
11 ngx_sha1="SHA1=\"$SHA1\""
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 owc*)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 ngx_makefile=makefile.owc
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16 ngx_opt="CPU_OPT=\"$CPU_OPT\""
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
17 ngx_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"`
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18 ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20 bcc)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21 ngx_makefile=makefile.bcc
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22 ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DSHA1_ASM=$SHA1_ASM"
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
23 ngx_sha1=`echo \-DSHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"`
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 esac
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 done=NO
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 case "$NGX_PLATFORM" in
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34 win32)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 cat << END >> $NGX_MAKEFILE
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 `echo "$SHA1/sha1.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 490
diff changeset
38 \$(MAKE) -f auto/lib/sha1/$ngx_makefile $ngx_opt $ngx_sha1
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 END
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 done=YES
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45 SunOS:*:i86pc)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46 if [ $SHA1_ASM = YES ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
47
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 cat << END >> $NGX_MAKEFILE
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 $SHA1/libsha.a: $NGX_MAKEFILE
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51 cd $SHA1 \\
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52 && \$(MAKE) CFLAGS="$SHA1_OPT -DSOL -DSHA1_ASM -DL_ENDIAN" \\
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53 CC="\$(CC)" CPP="\$(CPP)" \\
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
54 SHA_ASM_OBJ=asm/sx86-sol.o clean libsha.a
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56 END
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58 done=YES
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59 fi
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60 ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62 # FreeBSD: i386
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63 # Linux: i686
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65 *:i386 | *:i686)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 if [ $SHA1_ASM = YES ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68 cat << END >> $NGX_MAKEFILE
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70 $SHA1/libsha.a: $NGX_MAKEFILE
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71 cd $SHA1 \\
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
72 && \$(MAKE) CFLAGS="$SHA1_OPT -DELF -DSHA1_ASM -DL_ENDIAN" \\
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73 CC="\$(CC)" CPP="\$(CPP)" \\
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74 SHA_ASM_OBJ=asm/sx86-elf.o clean libsha.a
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
75
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76 END
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78 done=YES
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
79 fi
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
80 ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
81
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
82 esac
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
83
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
84
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
85 if [ $done = NO ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
87 cat << END >> $NGX_MAKEFILE
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
88
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
89 $SHA1/libsha.a: $NGX_MAKEFILE
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
90 cd $SHA1 \\
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
91 && \$(MAKE) CFLAGS="$SHA1_OPT" \\
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
92 CC="\$(CC)" SHA_ASM_OBJ= clean libsha.a
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
93
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
94 END
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
95
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
96 fi