nginx-0.1.13-RELEASE import
*) 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.
diff --git a/auto/lib/conf b/auto/lib/conf
index 275bea9..6e00592 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -6,14 +6,23 @@
. 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
