diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-06-02 16:22:32 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-06-02 16:22:32 +0000 |
| commit | 48a71b870032c0787bc31650f3143465a4cd417b (patch) | |
| tree | cdbc3eed0e6881d3632461f027b2547ab3b12f17 /auto/lib/openssl | |
| parent | 8e691fc5d70edca2a685bc341bbef7a097371349 (diff) | |
| download | nginx-48a71b870032c0787bc31650f3143465a4cd417b.tar.gz | |
Changes with nginx 0.8.0 02 Jun 2009v0.8.0
*) Feature: the "keepalive_requests" directive.
*) Feature: the "limit_rate_after" directive.
Thanks to Ivan Debnar.
*) Bugfix: XLST filter did not work in subrequests.
*) Bugfix: in relative paths handling in nginx/Windows.
*) Bugfix: in proxy_store, fastcgi_store, proxy_cache, and
fastcgi_cache in nginx/Windows.
*) Bugfix: in memory allocation error handling.
Thanks to Maxim Dounin and Kirill A. Korinskiy.
Diffstat (limited to 'auto/lib/openssl')
| -rw-r--r-- | auto/lib/openssl/conf | 11 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 23 |
2 files changed, 19 insertions, 15 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 8a762a2fc..731db80d7 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -66,6 +66,17 @@ else have=NGX_SSL . auto/have CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" OPENSSL=YES + else + +cat << END + +$0: error: SSL modules require the OpenSSL library. +You can either do not enable the modules, or install the OpenSSL library +into the system, or build the OpenSSL library statically from the source +with nginx by using --with-openssl=<path> option. + +END + exit 1 fi ;; diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index 6646cb2a4..3c21f436b 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -2,11 +2,6 @@ # Copyright (C) Igor Sysoev -case $USE_THREADS in - NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; - *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; -esac - case "$CC" in cl) @@ -21,7 +16,7 @@ END ;; - cl | bcc32) + bcc32) ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \ | sed -e "s/\//$ngx_regex_dirsep/g"` @@ -45,16 +40,14 @@ END ;; *) - case $OPENSSL in - - /*) - ngx_prefix="$OPENSSL/openssl" - ;; - - *) - ngx_prefix="$PWD/$OPENSSL/openssl" - ;; + case $USE_THREADS in + NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;; + *) OPENSSL_OPT="$OPENSSL_OPT threads" ;; + esac + case $OPENSSL in + /*) ngx_prefix="$OPENSSL/openssl" ;; + *) ngx_prefix="$PWD/$OPENSSL/openssl" ;; esac cat << END >> $NGX_MAKEFILE |