diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-12-21 12:30:30 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-12-21 12:30:30 +0000 |
| commit | b1dfe478a03ad6919f174812951f6a2bec8befae (patch) | |
| tree | d8802484f8dbf5309b17a95b5fc9749627720a53 /auto/lib | |
| parent | 5275a8b3ac534ff36973801ec2aa6ce1214d7cc9 (diff) | |
| download | nginx-release-0.1.13.tar.gz nginx-release-0.1.13.tar.bz2 | |
nginx-0.1.13-RELEASE importrelease-0.1.13
*) Feature: the server_names_hash and server_names_hash_threshold
directives.
*) Bugfix: the *.domain.tld names in the "server_name" directive did
not work.
*) Bugfix: the %request_length log parameter logged the incorrect
length.
Diffstat (limited to '')
| -rw-r--r-- | auto/lib/conf | 17 | ||||
| -rw-r--r-- | auto/lib/md5/conf | 1 |
2 files changed, 14 insertions, 4 deletions
diff --git a/auto/lib/conf b/auto/lib/conf index 275bea9cf..6e00592cc 100644 --- a/auto/lib/conf +++ b/auto/lib/conf @@ -6,14 +6,23 @@ if [ $USE_PCRE = YES ]; then . auto/lib/pcre/conf fi -if [ $USE_MD5 = YES ]; then - . auto/lib/md5/conf -fi - if [ $USE_OPENSSL = YES ]; then . auto/lib/openssl/conf fi +if [ $USE_MD5 = YES ]; then + + if [ $OPENSSL != NONE -a $OPENSSL != NO ]; then + have=NGX_HAVE_OPENSSL_MD5_H . auto/have + have=NGX_OPENSSL_MD5 . auto/have + MD5=YES + + else + . auto/lib/md5/conf + fi + +fi + if [ $USE_ZLIB = YES ]; then . auto/lib/zlib/conf fi diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index 812242352..1ca6b4317 100644 --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -8,6 +8,7 @@ if [ $MD5 != NONE ]; then # OpenSSL md5 OPENSSL_MD5=YES have=NGX_HAVE_OPENSSL_MD5 . auto/have + have=NGX_OPENSSL_MD5 . auto/have else # rsaref md5 OPENSSL_MD5=NO |