From c15717285d2157a603bb1b130b26d7baa549be7e Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Sat, 19 Mar 2005 12:38:37 +0000
Subject: nginx-0.1.25-RELEASE import

    *) Bugfix: nginx did run on Linux parisc.

    *) Feature: nginx now does not start under FreeBSD if the sysctl
       kern.ipc.somaxconn value is too big.

    *) Bugfix: if a request was internally redirected by the
       ngx_http_index_module module to the ngx_http_proxy_module or
       ngx_http_fastcgi_module modules, then the index file was not closed
       after request completion.

    *) Feature: the "proxy_pass" can be used in location with regular
       expression.

    *) Feature: the ngx_http_rewrite_filter_module module supports the
       condition like "if ($HTTP_USER_AGENT ~ MSIE)".

    *) Bugfix: nginx started too slow if the large number of addresses and
       text values were used in the "geo" directive.

    *) Change: a variable name must be declared as "$name" in the "geo"
       directive. The previous variant without "$" is still supported, but
       will be removed soon.

    *) Feature: the "%{VARIABLE}v" logging parameter.

    *) Feature: the "set $name value" directive.

    *) Bugfix: gcc 4.0 compatibility.

    *) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
---
 auto/lib/openssl/make | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'auto/lib')

diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index c1aec882a..ff05a380a 100644
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -1,17 +1,28 @@
 
 # Copyright (C) Igor Sysoev
 
+if test -n "$OPENSSL_OPT"; then
+    NGX_OPENSSL_CONFIG="./Configure \"$OPENSSL_OPT\""
+else
+    NGX_OPENSSL_CONFIG="./config"
+fi
+
+if test -n "$USE_THREADS"; then
+    NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads"
+fi
 
 case "$NGX_PLATFORM" in
     *)
-        echo "$OPENSSL/libssl.a:"                                 >> $MAKEFILE
-        echo "	cd $OPENSSL \\"                                   >> $MAKEFILE
-        echo "	&& \$(MAKE) clean \\"                             >> $MAKEFILE
-        echo "	&& CC=\"\$(CC)\" \\"                              >> $MAKEFILE
-        echo "	./config threads no-shared \\"                    >> $MAKEFILE
-        echo "	&& \$(MAKE)"                                      >> $MAKEFILE
+        cat << END                                            >> $NGX_MAKEFILE
+
+$OPENSSL/libssl.a:
+	cd $OPENSSL \\
+	&& \$(MAKE) clean \\
+	&& $NGX_OPENSSL_CONFIG no-shared \\
+	&& \$(MAKE)
+
+END
+
     ;;
 
 esac
-
-echo                                                              >> $MAKEFILE
-- 
cgit