Mercurial > hg > nginx-vendor-current

annotate auto/lib/sha1/conf @ 660:d0f7a625f27c NGINX_1_1_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.14 *) Feature: multiple "limit_req" limits may be used simultaneously. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "proxy_redirect" directives might not be correctly inherited. *) Bugfix: memory leak during reconfiguration if the "pcre_jit" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Jan 2012 00:00:00 +0400
parents a7a5fa2e395b
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
660
d0f7a625f27c nginx 1.1.14
Igor Sysoev <http://sysoev.ru>
parents: 626
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 if [ $SHA1 != NONE ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 376
diff changeset
8 have=NGX_HAVE_SHA1 . auto/have
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 CORE_INCS="$CORE_INCS $SHA1"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11 case "$NGX_CC_NAME" in
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 msvc* | owc* | bcc)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 LINK_DEPS="$LINK_DEPS $SHA1/sha1.lib"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 CORE_LIBS="$CORE_LIBS $SHA1/sha1.lib"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16 ;;
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18 icc*)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19 LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21 # to allow -ipo optimization we link with the *.o but not library
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22 CORE_LIBS="$CORE_LIBS $SHA1/sha1_dgst.o"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 if [ $SHA1_ASM = YES ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 CORE_LIBS="$CORE_LIBS $SHA1/asm/sx86-elf.o"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 fi
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 *)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 CORE_LIBS="$CORE_LIBS $SHA1/libsha.a"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 #CORE_LIBS="$CORE_LIBS -L $SHA1 -lsha"
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
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 esac
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 else
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39 if [ "$NGX_PLATFORM" != win32 ]; then
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
40
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41 SHA1=NO
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 # FreeBSD
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 ngx_feature="sha1 in system md library"
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 376
diff changeset
46 ngx_feature_name=NGX_HAVE_SHA1
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
47 ngx_feature_run=no
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 ngx_feature_incs="#include <sha.h>"
258
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 202
diff changeset
49 ngx_feature_path=
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 ngx_feature_libs="-lmd"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51 ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52 . auto/feature
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
54 ngx_sha1_lib="system md"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
55
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
56 if [ $ngx_found = no ]; then
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
57
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
58 # OpenSSL crypto library
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
59
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
60 ngx_feature="OpenSSL sha1 crypto library"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
61 ngx_feature_incs="#include <openssl/sha.h>"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
62 ngx_feature_libs="-lcrypto"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
63 . auto/feature
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
64
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
65 ngx_sha1_lib="system crypto"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
66
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
67 if [ $ngx_found = yes ]; then
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
68 have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
69 fi
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
70 fi
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
72 if [ $ngx_found = yes ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74 SHA1=YES
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
75 SHA1_LIB=$ngx_sha1_lib
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76 fi
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77 fi
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
79 fi