Mercurial > hg > nginx-vendor-current

annotate auto/lib/openssl/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 53f5f04a64b8
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: 586
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 [ $OPENSSL != NONE ]; then
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 case "$CC" in
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
9
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
10 cl | bcc32)
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
11 have=NGX_OPENSSL . auto/have
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
12 have=NGX_SSL . auto/have
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
13
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
14 CFLAGS="$CFLAGS -DNO_SYS_TYPES_H"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
15
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
16 CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
17 CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
18 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
19 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
20
482
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
21 # libeay32.lib requires gdi32.lib
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
22 CORE_LIBS="$CORE_LIBS gdi32.lib"
566
be4f34123024 nginx 0.8.35
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
23 # OpenSSL 1.0.0 requires crypt32.lib
be4f34123024 nginx 0.8.35
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
24 CORE_LIBS="$CORE_LIBS crypt32.lib"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
25 ;;
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
26
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27 *)
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28 have=NGX_OPENSSL . auto/have
126
df17fbafec8f nginx 0.3.10
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
29 have=NGX_SSL . auto/have
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
30
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
31 CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include"
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
32 CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
33 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
34 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 482
diff changeset
35 CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
36 ;;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 esac
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 else
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40
586
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
41 if [ "$NGX_PLATFORM" != win32 ]; then
110
dad2fe8ecf08 nginx 0.3.2
Igor Sysoev <http://sysoev.ru>
parents: 90
diff changeset
42
586
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
43 OPENSSL=NO
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
44
586
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
45 ngx_feature="OpenSSL library"
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
46 ngx_feature_name="NGX_OPENSSL"
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
47 ngx_feature_run=no
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
48 ngx_feature_incs="#include <openssl/ssl.h>"
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
49 ngx_feature_path=
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
50 ngx_feature_libs="-lssl -lcrypto"
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
51 ngx_feature_test="SSL_library_init()"
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
52 . auto/feature
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53
586
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
54 if [ $ngx_found = yes ]; then
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
55 have=NGX_SSL . auto/have
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
56 CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
57 OPENSSL=YES
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
58 fi
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
59 fi
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
60
586
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
61 if [ $OPENSSL != YES ]; then
496
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
62
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
63 cat << END
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
64
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
65 $0: error: SSL modules require the OpenSSL library.
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
66 You can either do not enable the modules, or install the OpenSSL library
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
67 into the system, or build the OpenSSL library statically from the source
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
68 with nginx by using --with-openssl=<path> option.
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
69
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
70 END
586
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
71 exit 1
53f5f04a64b8 nginx 0.8.45
Igor Sysoev <http://sysoev.ru>
parents: 566
diff changeset
72 fi
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74 fi