Mercurial > hg > nginx-vendor-current

annotate auto/lib/openssl/conf @ 566:be4f34123024 NGINX_0_8_35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.35 *) Change: now the charset filter runs before the SSI filter. *) Feature: the "chunked_transfer_encoding" directive. *) Bugfix: an "&" character was not escaped when it was copied in arguments part in a rewrite rule. *) Bugfix: nginx might be terminated abnormally while a signal processing or if the directive "timer_resolution" was used on platforms which do not support kqueue or eventport notification methods. Thanks to George Xie and Maxim Dounin. *) Bugfix: if temporary files and permanent storage area resided at different file systems, then permanent file modification times were incorrect. Thanks to Maxim Dounin. *) Bugfix: ngx_http_memcached_module might issue the error message "memcached sent invalid trailer". Thanks to Maxim Dounin. *) Bugfix: nginx could not built zlib-1.2.4 library using the library sources. Thanks to Maxim Dounin. *) Bugfix: a segmentation fault occurred in a worker process, if there was large stderr output before FastCGI response; the bug had appeared in 0.8.34. Thanks to Maxim Dounin.
author Igor Sysoev <http://sysoev.ru>
date Mon, 29 Mar 2010 00:00:00 +0400
parents 4c5d2c627a6c
children 53f5f04a64b8
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
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3
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 if [ $OPENSSL != NONE ]; then
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7 case "$CC" in
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
8
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
9 cl | bcc32)
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
10 have=NGX_OPENSSL . auto/have
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
11 have=NGX_SSL . auto/have
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
12
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
13 CFLAGS="$CFLAGS -DNO_SYS_TYPES_H"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
14
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
15 CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
16 CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
17 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
18 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
19
482
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
20 # libeay32.lib requires gdi32.lib
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
21 CORE_LIBS="$CORE_LIBS gdi32.lib"
566
be4f34123024 nginx 0.8.35
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
22 # OpenSSL 1.0.0 requires crypt32.lib
be4f34123024 nginx 0.8.35
Igor Sysoev <http://sysoev.ru>
parents: 530
diff changeset
23 CORE_LIBS="$CORE_LIBS crypt32.lib"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
24 ;;
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
25
0
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 have=NGX_OPENSSL . auto/have
126
df17fbafec8f nginx 0.3.10
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
28 have=NGX_SSL . auto/have
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
29
530
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
30 CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include"
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
31 CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
32 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
4c5d2c627a6c nginx 0.8.17
Igor Sysoev <http://sysoev.ru>
parents: 496
diff changeset
33 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 482
diff changeset
34 CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
35 ;;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 esac
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 else
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
40 case "$NGX_PLATFORM" in
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
42 win32)
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
43 have=NGX_OPENSSL . auto/have
126
df17fbafec8f nginx 0.3.10
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
44 have=NGX_SSL . auto/have
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45 OPENSSL=YES
110
dad2fe8ecf08 nginx 0.3.2
Igor Sysoev <http://sysoev.ru>
parents: 90
diff changeset
46
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
47 CORE_INCS="$CORE_INCS c:/openssl/include"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
48 CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
49 CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
50
482
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
51 # libeay32.lib requires gdi32.lib
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
52 CORE_LIBS="$CORE_LIBS gdi32.lib"
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
53 ;;
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
54
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
55 *)
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
56 OPENSSL=NO
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
58 ngx_feature="OpenSSL library"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
59 ngx_feature_name="NGX_OPENSSL"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
60 ngx_feature_run=no
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
61 ngx_feature_incs="#include <openssl/ssl.h>"
258
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
62 ngx_feature_path=
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
63 ngx_feature_libs="-lssl -lcrypto"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
64 ngx_feature_test="SSL_library_init()"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
65 . auto/feature
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
66
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
67 if [ $ngx_found = yes ]; then
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
68 have=NGX_SSL . auto/have
494
499474178a11 nginx 0.7.59
Igor Sysoev <http://sysoev.ru>
parents: 492
diff changeset
69 CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL"
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
70 OPENSSL=YES
496
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
71 else
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
72
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
73 cat << END
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
74
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
75 $0: error: SSL modules require the OpenSSL library.
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
76 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
77 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
78 with nginx by using --with-openssl=<path> option.
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
79
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
80 END
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 494
diff changeset
81 exit 1
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
82 fi
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
83 ;;
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
84
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
85 esac
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
87 fi