diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-04-15 15:58:06 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-04-15 15:58:06 +0000 |
| commit | b3451785fe85ff56e4aa52a50a202ec7239264b8 (patch) | |
| tree | 3c4a227a08a420d574ad48af741ead2e6fc82a91 /auto/lib | |
| parent | 9813a1999c0297210785c064ea2a02a064d58900 (diff) | |
| download | nginx-b3451785fe85ff56e4aa52a50a202ec7239264b8.tar.gz nginx-b3451785fe85ff56e4aa52a50a202ec7239264b8.tar.bz2 | |
an internal MD5 implemenation
patch by Maxim Dounin
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/conf | 1 | ||||
| -rw-r--r-- | auto/lib/md5/conf | 16 |
2 files changed, 3 insertions, 14 deletions
diff --git a/auto/lib/conf b/auto/lib/conf index 60e891b9e..f89d922f8 100644 --- a/auto/lib/conf +++ b/auto/lib/conf @@ -29,6 +29,7 @@ if [ $USE_MD5 = YES ]; then if [ $USE_OPENSSL = YES ]; then have=NGX_HAVE_OPENSSL_MD5_H . auto/have have=NGX_OPENSSL_MD5 . auto/have + have=NGX_HAVE_MD5 . auto/have MD5=YES MD5_LIB=OpenSSL diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf index da1bf1b2c..2a8f8ad92 100644 --- 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= @@ -97,17 +98,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 |