Mercurial > hg > nginx-vendor-current

annotate auto/lib/sha1/conf @ 626:a7a5fa2e395b NGINX_1_0_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.3 *) Feature: the "auth_basic_user_file" directive supports "$apr1", "{PLAIN}", and "{SSHA}" password encryption methods. Thanks to Maxim Dounin. *) Feature: the "geoip_org" directive and $geoip_org variable. Thanks to Alexander Uskov, Arnaud Granal, and Denis F. Latypoff. *) Feature: ngx_http_geo_module and ngx_http_geoip_module support IPv4 addresses mapped to IPv6 addresses. *) Bugfix: a segmentation fault occurred in a worker process during testing IPv4 address mapped to IPv6 address, if access or deny rules were defined only for IPv6; the bug had appeared in 0.8.22. *) Bugfix: a cached reponse may be broken if proxy/fastcgi/scgi/ uwsgi_cache_bypass and proxy/fastcgi/scgi/uwsgi_no_cache directive values were different; the bug had appeared in 0.8.46.
author Igor Sysoev <http://sysoev.ru>
date Wed, 25 May 2011 00:00:00 +0400
parents edf1cb6c328e
children d0f7a625f27c
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
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3
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 if [ $SHA1 != NONE ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 376
diff changeset
7 have=NGX_HAVE_SHA1 . auto/have
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 CORE_INCS="$CORE_INCS $SHA1"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 case "$NGX_CC_NAME" in
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12 msvc* | owc* | bcc)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13 LINK_DEPS="$LINK_DEPS $SHA1/sha1.lib"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 CORE_LIBS="$CORE_LIBS $SHA1/sha1.lib"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 ;;
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 icc*)
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18 LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
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 # 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
21 CORE_LIBS="$CORE_LIBS $SHA1/sha1_dgst.o"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23 if [ $SHA1_ASM = YES ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 CORE_LIBS="$CORE_LIBS $SHA1/asm/sx86-elf.o"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 fi
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 ;;
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 LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 CORE_LIBS="$CORE_LIBS $SHA1/libsha.a"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 #CORE_LIBS="$CORE_LIBS -L $SHA1 -lsha"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 ;;
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 esac
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 else
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 if [ "$NGX_PLATFORM" != win32 ]; then
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
39
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 SHA1=NO
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 # FreeBSD
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 ngx_feature="sha1 in system md library"
626
a7a5fa2e395b nginx 1.0.3
Igor Sysoev <http://sysoev.ru>
parents: 376
diff changeset
45 ngx_feature_name=NGX_HAVE_SHA1
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46 ngx_feature_run=no
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
47 ngx_feature_incs="#include <sha.h>"
258
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 202
diff changeset
48 ngx_feature_path=
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49 ngx_feature_libs="-lmd"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51 . auto/feature
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
53 ngx_sha1_lib="system md"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
54
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
55 if [ $ngx_found = no ]; then
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
56
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
57 # OpenSSL crypto library
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
58
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
59 ngx_feature="OpenSSL sha1 crypto library"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
60 ngx_feature_incs="#include <openssl/sha.h>"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
61 ngx_feature_libs="-lcrypto"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
62 . auto/feature
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
63
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
64 ngx_sha1_lib="system crypto"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
65
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
66 if [ $ngx_found = yes ]; then
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
67 have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
68 fi
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
69 fi
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71 if [ $ngx_found = yes ]; then
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
72 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73 SHA1=YES
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
74 SHA1_LIB=$ngx_sha1_lib
202
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
75 fi
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
ca5f86d94316 nginx 0.3.48
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78 fi