Mercurial > hg > nginx
comparison auto/lib/openssl/conf @ 3430:966f9cf9c7da stable-0.7
merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
SSL fixes:
*) $ssl_session_id
*) allow "make clean" for OpenSSL, the bug was introduced in r2874
*) disable SSLv2 and use only strong ciphers by default
*) decrease SSL handshake error level to info
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 01 Feb 2010 14:39:16 +0000 |
| parents | cb3d4dc8c6db |
| children | 92378c49456d |
comparison
equal
deleted
inserted
replaced
| 3429:9ecd253fcc90 | 3430:966f9cf9c7da |
|---|---|
| 23 | 23 |
| 24 *) | 24 *) |
| 25 have=NGX_OPENSSL . auto/have | 25 have=NGX_OPENSSL . auto/have |
| 26 have=NGX_SSL . auto/have | 26 have=NGX_SSL . auto/have |
| 27 | 27 |
| 28 CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" | 28 CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" |
| 29 CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" | 29 CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" |
| 30 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.a" | 30 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" |
| 31 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.a" | 31 CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" |
| 32 CORE_LIBS="$CORE_LIBS $NGX_LIBDL" | 32 CORE_LIBS="$CORE_LIBS $NGX_LIBDL" |
| 33 ;; | 33 ;; |
| 34 esac | 34 esac |
| 35 | 35 |
| 36 else | 36 else |