summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-09-28 13:08:15 +0000
committerJonathan Kolb <jon@b0g.us>2009-09-28 13:08:15 +0000
commit49590f7810331a2b33e8a120017f3a01aeab2176 (patch)
tree240d6d750c6fc938e69c2e435f92824dfa87dcf5 /auto
parentc1f184e9ab685444d26023e6203754de36c83860 (diff)
downloadnginx-49590f7810331a2b33e8a120017f3a01aeab2176.tar.gz
Changes with nginx 0.8.17 28 Sep 2009v0.8.17
*) Security: now "/../" are disabled in "Destination" request header line. *) Change: now $host variable value is always low case. *) Feature: the $ssl_session_id variable. *) Bugfix: socket leak; the bug had appeared in 0.8.11.
Diffstat (limited to 'auto')
-rw-r--r--auto/lib/openssl/conf8
-rw-r--r--auto/lib/openssl/make6
2 files changed, 7 insertions, 7 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 731db80d7..64f2ce02f 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -25,10 +25,10 @@ if [ $OPENSSL != NONE ]; then
have=NGX_OPENSSL . auto/have
have=NGX_SSL . auto/have
- CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
- CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.a"
- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.a"
+ CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include"
+ CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
+ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
+ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
;;
esac
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index 3c21f436b..d497d88e1 100644
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -46,13 +46,13 @@ END
esac
case $OPENSSL in
- /*) ngx_prefix="$OPENSSL/openssl" ;;
- *) ngx_prefix="$PWD/$OPENSSL/openssl" ;;
+ /*) ngx_prefix="$OPENSSL/.openssl" ;;
+ *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
esac
cat << END >> $NGX_MAKEFILE
-$OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE
+$OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
cd $OPENSSL \\
&& \$(MAKE) clean \\
&& ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\