From d3283ff9224a41a1a24c2d89f671811c0747480a Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 5 Dec 2005 13:18:09 +0000
Subject: nginx-0.3.13-RELEASE import

    *) Feature: the IMAP/POP3 proxy supports STARTTLS and STLS.

    *) Bugfix: the IMAP/POP3 proxy did not work with the select, poll, and
       /dev/poll methods.

    *) Bugfix: in SSI handling.

    *) Bugfix: now Solaris sendfilev() is not used to transfer the client
       request body to FastCGI-server via the unix domain socket.

    *) Bugfix: the "auth_basic" directive did not disable the
       authorization; the bug had appeared in 0.3.11.
---
 auto/lib/openssl/conf | 58 +++++++++++++++++++++++++++++++++------------------
 auto/lib/openssl/make |  1 +
 2 files changed, 39 insertions(+), 20 deletions(-)

(limited to 'auto/lib/openssl')

diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index 3356689e9..32f82ca7c 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -23,29 +23,47 @@ if [ $OPENSSL != NONE ]; then
 
 else
 
-    if [ "$NGX_PLATFORM" != win32 ]; then
-        OPENSSL=NO
-
-        ngx_feature="OpenSSL library"
-        ngx_feature_name="NGX_OPENSSL"
-        ngx_feature_run=no
-        ngx_feature_incs="#include <openssl/ssl.h>"
-        ngx_feature_libs="-lssl -lcrypto"
-        ngx_feature_test="SSL_library_init()"
-        . auto/feature
-
-        if [ $ngx_found = yes ]; then
+    case "$NGX_PLATFORM" in
+
+        win32)
+            have=NGX_OPENSSL . auto/have
             have=NGX_SSL . auto/have
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
             OPENSSL=YES
 
-            case "$NGX_SYSTEM" in
-                SunOS)
-                    CORE_LIBS="$CORE_LIBS -ldl"
-                ;;
-            esac
-        fi
+            CORE_INCS="$CORE_INCS c:/openssl/include"
+            CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib"
+            CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib"
+
+            # libeay32.lib requires gdi32.lib
+            CORE_LIBS="$CORE_LIBS gdi32.lib"
+            # OpenSSL 0.8's libeay32.lib requires advapi32.lib
+            CORE_LIBS="$CORE_LIBS advapi32.lib"
+        ;;
+
+        *)
+            OPENSSL=NO
 
-    fi
+            ngx_feature="OpenSSL library"
+            ngx_feature_name="NGX_OPENSSL"
+            ngx_feature_run=no
+            ngx_feature_incs="#include <openssl/ssl.h>"
+            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"
+                OPENSSL=YES
+
+                case "$NGX_SYSTEM" in
+                    SunOS)
+                        CORE_LIBS="$CORE_LIBS -ldl"
+                    ;;
+                esac
+            fi
+        ;;
+
+    esac
 
 fi
diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make
index ff05a380a..31e15dc4d 100644
--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@@ -1,6 +1,7 @@
 
 # Copyright (C) Igor Sysoev
 
+
 if test -n "$OPENSSL_OPT"; then
     NGX_OPENSSL_CONFIG="./Configure \"$OPENSSL_OPT\""
 else
-- 
cgit