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

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 8dc007eddbcf
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
f0b350454894 nginx 0.1.0
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: 622
diff changeset
3 # Copyright (C) Nginx, Inc.
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6 if [ $MD5 != NONE ]; then
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 376
diff changeset
8 if grep MD5_Init $MD5/md5.h 2>&1 >/dev/null; then
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 # OpenSSL md5
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 OPENSSL_MD5=YES
18
6f8b0dc0f8dd nginx 0.1.9
Igor Sysoev <http://sysoev.ru>
parents: 10
diff changeset
11 have=NGX_HAVE_OPENSSL_MD5 . auto/have
26
45fe5b98a9de nginx 0.1.13
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
12 have=NGX_OPENSSL_MD5 . auto/have
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13 else
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 # rsaref md5
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 OPENSSL_MD5=NO
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16 fi
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17
622
8dc007eddbcf nginx 1.0.1
Igor Sysoev <http://sysoev.ru>
parents: 586
diff changeset
18 have=NGX_HAVE_MD5 . auto/have
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19 CORE_INCS="$CORE_INCS $MD5"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
21 case "$NGX_CC_NAME" in
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
23 msvc* | owc* | bcc)
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27
10
46833bd150cb nginx 0.1.5
Igor Sysoev <http://sysoev.ru>
parents: 4
diff changeset
28 icc*)
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 # to allow -ipo optimization we link with the *.o but not library
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 CORE_LIBS="$CORE_LIBS $MD5/md5_dgst.o"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34 if [ $MD5_ASM = YES ]; then
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 CORE_LIBS="$CORE_LIBS $MD5/asm/mx86-elf.o"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 fi
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39 *)
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41 CORE_LIBS="$CORE_LIBS $MD5/libmd5.a"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 #CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45 esac
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
47 else
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48
42
41ccba1aba45 nginx 0.1.21
Igor Sysoev <http://sysoev.ru>
parents: 26
diff changeset
49 if [ "$NGX_PLATFORM" != win32 ]; then
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
50
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
51 MD5=NO
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
53 # FreeBSD, Solaris 10
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
54
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
55 ngx_feature="system md library"
622
8dc007eddbcf nginx 1.0.1
Igor Sysoev <http://sysoev.ru>
parents: 586
diff changeset
56 ngx_feature_name=NGX_HAVE_MD5
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
57 ngx_feature_run=no
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
58 ngx_feature_incs="#include <md5.h>"
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
59 ngx_feature_path=
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
60 ngx_feature_libs="-lmd"
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
61 ngx_feature_test="MD5_CTX md5; MD5Init(&md5)"
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
62 . auto/feature
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
64 ngx_md5_lib="system md"
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
66 if [ $ngx_found = no ]; then
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
67
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
68 # Solaris 8/9
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
70 ngx_feature="system md5 library"
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
71 ngx_feature_libs="-lmd5"
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
72 . auto/feature
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
73
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
74 ngx_md5_lib="system md5"
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
75 fi
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
77 if [ $ngx_found = no ]; then
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
78
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
79 # OpenSSL crypto library
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
80
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
81 ngx_feature="OpenSSL md5 crypto library"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
82 ngx_feature_name="NGX_OPENSSL_MD5"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
83 ngx_feature_incs="#include <openssl/md5.h>"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
84 ngx_feature_libs="-lcrypto"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
85 ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
86 . auto/feature
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
87
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
88 ngx_md5_lib="system crypto"
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
89
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
90 if [ $ngx_found = yes ]; then
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
91 have=NGX_HAVE_OPENSSL_MD5_H . auto/have
622
8dc007eddbcf nginx 1.0.1
Igor Sysoev <http://sysoev.ru>
parents: 586
diff changeset
92 have=NGX_HAVE_MD5 . auto/have
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
93 fi
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
94 fi
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
95
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
96 if [ $ngx_found = yes ]; then
4
4b2dafa26fe2 nginx 0.1.2
Igor Sysoev <http://sysoev.ru>
parents: 0
diff changeset
97 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
98 MD5=YES
376
edf1cb6c328e nginx 0.7.0
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
99 MD5_LIB=$ngx_md5_lib
586
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 502
diff changeset
100 fi
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 502
diff changeset
101 fi
496
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
102
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
103 fi