diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-07-13 11:59:43 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2010-07-13 11:59:43 +0000 |
| commit | 5bb3d73305ddc4b7adb5b791c13f66d071c5af2a (patch) | |
| tree | 83aa47f5f73cb57a543110d78e1c0b126e554dcb /auto/lib/openssl | |
| parent | eca0feeb4654215e90ddc20151ff0f8157be89b5 (diff) | |
| download | nginx-5bb3d73305ddc4b7adb5b791c13f66d071c5af2a.tar.gz | |
Changes with nginx 0.8.45 13 Jul 2010v0.8.45
*) Feature: ngx_http_xslt_filter improvements.
Thanks to Laurence Rowe.
*) Bugfix: SSI response might be truncated after include with
wait="yes"; the bug had appeared in 0.7.25.
Thanks to Maxim Dounin.
*) Bugfix: the "listen" directive did not support the "setfib=0"
parameter.
Diffstat (limited to 'auto/lib/openssl')
| -rw-r--r-- | auto/lib/openssl/conf | 52 |
1 files changed, 19 insertions, 33 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index c57a7c830..8218a5b97 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -37,38 +37,27 @@ if [ $OPENSSL != NONE ]; then else - case "$NGX_PLATFORM" in + if [ "$NGX_PLATFORM" != win32 ]; then - win32) - have=NGX_OPENSSL . auto/have - have=NGX_SSL . auto/have - OPENSSL=YES + OPENSSL=NO - CORE_INCS="$CORE_INCS c:/openssl/include" - CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib" - CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib" + ngx_feature="OpenSSL library" + ngx_feature_name="NGX_OPENSSL" + ngx_feature_run=no + ngx_feature_incs="#include <openssl/ssl.h>" + ngx_feature_path= + ngx_feature_libs="-lssl -lcrypto" + ngx_feature_test="SSL_library_init()" + . auto/feature - # libeay32.lib requires gdi32.lib - CORE_LIBS="$CORE_LIBS gdi32.lib" - ;; + if [ $ngx_found = yes ]; then + have=NGX_SSL . auto/have + CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" + OPENSSL=YES + fi + fi - *) - OPENSSL=NO - - ngx_feature="OpenSSL library" - ngx_feature_name="NGX_OPENSSL" - ngx_feature_run=no - ngx_feature_incs="#include <openssl/ssl.h>" - ngx_feature_path= - ngx_feature_libs="-lssl -lcrypto" - ngx_feature_test="SSL_library_init()" - . auto/feature - - if [ $ngx_found = yes ]; then - have=NGX_SSL . auto/have - CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" - OPENSSL=YES - else + if [ $OPENSSL != YES ]; then cat << END @@ -78,10 +67,7 @@ into the system, or build the OpenSSL library statically from the source with nginx by using --with-openssl=<path> option. END - exit 1 - fi - ;; - - esac + exit 1 + fi fi |