Mercurial > hg > nginx-vendor-current

diff auto/lib/md5/conf @ 622:8dc007eddbcf NGINX_1_0_1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.0.1 *) Change: now the "split_clients" directive uses MurmurHash2 algorithm because of better distribution. Thanks to Oleg Mamontov. *) Change: now long strings starting with zero are not considered as false values. Thanks to Maxim Dounin. *) Change: now nginx uses a default listen backlog value 511 on Linux. *) Feature: the $upstream_... variables may be used in the SSI and perl modules. *) Bugfix: now nginx limits better disk cache size. Thanks to Oleg Mamontov. *) Bugfix: a segmentation fault might occur while parsing incorrect IPv4 address; the bug had appeared in 0.9.3. Thanks to Maxim Dounin. *) Bugfix: nginx could not be built by gcc 4.6 without --with-debug option. *) Bugfix: nginx could not be built on Solaris 9 and earlier; the bug had appeared in 0.9.3. Thanks to Dagobert Michelsen. *) Bugfix: $request_time variable had invalid values if subrequests were used; the bug had appeared in 0.8.47. Thanks to Igor A. Valcov.
author Igor Sysoev <http://sysoev.ru>
date Tue, 03 May 2011 00:00:00 +0400
parents 53f5f04a64b8
children d0f7a625f27c
line wrap: on
line diff
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -14,6 +14,7 @@ if [ $MD5 != NONE ]; then
         OPENSSL_MD5=NO
     fi
 
+    have=NGX_HAVE_MD5 . auto/have
     CORE_INCS="$CORE_INCS $MD5"
 
     case "$NGX_CC_NAME" in
@@ -51,7 +52,7 @@ else
             # FreeBSD, Solaris 10
 
             ngx_feature="system md library"
-            ngx_feature_name=
+            ngx_feature_name=NGX_HAVE_MD5
             ngx_feature_run=no
             ngx_feature_incs="#include <md5.h>"
             ngx_feature_path=
@@ -87,6 +88,7 @@ else
 
             if [ $ngx_found = yes ]; then
                 have=NGX_HAVE_OPENSSL_MD5_H . auto/have
+                have=NGX_HAVE_MD5 . auto/have
             fi
         fi
 
@@ -97,17 +99,4 @@ else
         fi
     fi
 
-    if [ $MD5 != YES ]; then
-cat << END
-
-$0: error: the HTTP cache module requires md5 functions
-from OpenSSL library.  You can either disable the module by using
---without-http-cache option, or install the OpenSSL library into the system,
-or build the OpenSSL library statically from the source with nginx by using
---with-http_ssl_module --with-openssl=<path> options.
-
-END
-        exit 1
-    fi
-
 fi