Mercurial > hg > nginx
annotate auto/lib/conf @ 4160:88369902edb1 stable-1.0
Merging r4010, r4065:
SSL related fixes:
*) Fixing proxy_set_body and proxy_pass_request_body with SSL.
Flush flag wasn't set in constructed buffer and this prevented any data
from being actually sent to upstream due to SSL buffering. Make sure
we always set flush in the last buffer we are going to sent.
See here for report:
http://nginx.org/pipermail/nginx-ru/2011-June/041552.html
*) Proper SSL shutdown handling.
If connection has unsent alerts, SSL_shutdown() tries to send them even
if SSL_set_shutdown(SSL_RECEIVED_SHUTDOWN|SSL_SENT_SHUTDOWN) was used.
This can be prevented by SSL_set_quiet_shutdown(). SSL_set_shutdown()
is required nevertheless to preserve session.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Fri, 30 Sep 2011 13:42:59 +0000 |
| parents | 9c057d5e1c27 |
| children | d620f497c50f |
| rev | line source |
|---|---|
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
399
diff
changeset
|
1 |
|
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
399
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
|
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
399
diff
changeset
|
3 |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
4 |
| 481 | 5 if [ $USE_PCRE = YES -o $PCRE != NONE ]; then |
|
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
212
diff
changeset
|
6 . auto/lib/pcre/conf |
|
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
7 |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
8 else |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
9 if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
10 |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
11 cat << END |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
12 |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
13 $0: error: the HTTP rewrite module requires the PCRE library. |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
14 You can either disable the module by using --without-http_rewrite_module |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
15 option or you have to enable the PCRE support. |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
16 |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
17 END |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
18 exit 1 |
|
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
19 fi |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
20 fi |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
21 |
|
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2892
diff
changeset
|
22 |
| 477 | 23 if [ $USE_OPENSSL = YES ]; then |
| 24 . auto/lib/openssl/conf | |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
25 fi |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
26 |
| 477 | 27 if [ $USE_MD5 = YES ]; then |
| 28 | |
|
2892
3e10e2b64007
use md5/sha1 in OpenSSL only if OpenSSL is used
Igor Sysoev <igor@sysoev.ru>
parents:
2788
diff
changeset
|
29 if [ $USE_OPENSSL = YES ]; then |
| 477 | 30 have=NGX_HAVE_OPENSSL_MD5_H . auto/have |
| 31 have=NGX_OPENSSL_MD5 . auto/have | |
|
3895
b659514a3948
an internal MD5 implemenation
Igor Sysoev <igor@sysoev.ru>
parents:
3363
diff
changeset
|
32 have=NGX_HAVE_MD5 . auto/have |
| 477 | 33 MD5=YES |
|
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
34 MD5_LIB=OpenSSL |
| 477 | 35 |
| 36 else | |
| 37 . auto/lib/md5/conf | |
| 38 fi | |
| 39 | |
|
399
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
40 fi |
|
4e21d1291a14
nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
41 |
| 653 | 42 if [ $USE_SHA1 = YES ]; then |
| 43 | |
|
2892
3e10e2b64007
use md5/sha1 in OpenSSL only if OpenSSL is used
Igor Sysoev <igor@sysoev.ru>
parents:
2788
diff
changeset
|
44 if [ $USE_OPENSSL = YES ]; then |
| 653 | 45 have=NGX_HAVE_OPENSSL_SHA1_H . auto/have |
|
3922
9c057d5e1c27
"$apr1", "{PLAIN}", and "{SSHA}" password methods in auth basic module
Igor Sysoev <igor@sysoev.ru>
parents:
3895
diff
changeset
|
46 have=NGX_HAVE_SHA1 . auto/have |
| 653 | 47 SHA1=YES |
|
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
1949
diff
changeset
|
48 SHA1_LIB=OpenSSL |
| 653 | 49 |
| 50 else | |
| 51 . auto/lib/sha1/conf | |
| 52 fi | |
| 53 | |
| 54 fi | |
| 55 | |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
56 if [ $USE_ZLIB = YES ]; then |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
57 . auto/lib/zlib/conf |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
58 fi |
| 599 | 59 |
| 2139 | 60 if [ $USE_LIBXSLT = YES ]; then |
| 61 . auto/lib/libxslt/conf | |
| 62 fi | |
| 63 | |
| 2788 | 64 if [ $USE_LIBGD = YES ]; then |
| 65 . auto/lib/libgd/conf | |
| 66 fi | |
| 67 | |
| 599 | 68 if [ $USE_PERL = YES ]; then |
| 69 . auto/lib/perl/conf | |
| 70 fi | |
| 1949 | 71 |
| 2985 | 72 if [ $HTTP_GEOIP = YES ]; then |
| 73 . auto/lib/geoip/conf | |
| 74 fi | |
| 3363 | 75 |
| 1949 | 76 if [ $NGX_GOOGLE_PERFTOOLS = YES ]; then |
| 77 . auto/lib/google-perftools/conf | |
| 78 fi | |
| 3363 | 79 |
| 80 if [ $NGX_LIBATOMIC != NO ]; then | |
| 81 . auto/lib/libatomic/conf | |
| 82 fi |