summaryrefslogtreecommitdiffhomepage
path: root/auto
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-09-06 16:09:32 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-09-06 16:09:32 +0000
commitceb992921cee6f76d1752af2d388ee6a1d71e078 (patch)
tree2b4916a12d02210134939b7fb388a270e76002fa /auto
parent5650106a09de8e8d876ed38fbff57b2161d910c4 (diff)
downloadnginx-release-0.1.44.tar.gz
nginx-release-0.1.44.tar.bz2
nginx-0.1.44-RELEASE importrelease-0.1.44
*) Feature: the IMAP/POP3 proxy supports SSL. *) Feature: the "proxy_timeout" directive of the ngx_imap_proxy_module. *) Feature: the "userid_mark" directive. *) Feature: the $remote_user variable value is determined independently of authorization use.
Diffstat (limited to 'auto')
-rw-r--r--auto/modules8
-rw-r--r--auto/options2
-rw-r--r--auto/sources4
3 files changed, 14 insertions, 0 deletions
diff --git a/auto/modules b/auto/modules
index dccb7a7db..606149acc 100644
--- a/auto/modules
+++ b/auto/modules
@@ -228,6 +228,14 @@ fi
if [ $IMAP = YES ]; then
modules="$modules $IMAP_MODULES"
+ if [ $IMAP_SSL = YES ]; then
+ modules="$modules $IMAP_SSL_MODULE"
+ IMAP_DEPS="$IMAP_DEPS $IMAP_SSL_DEPS"
+ IMAP_SRCS="$IMAP_SRCS $IMAP_SSL_SRCS"
+ have=NGX_IMAP_SSL . auto/have
+ USE_OPENSSL=YES
+ fi
+
modules="$modules $IMAP_AUTH_HTTP_MODULE"
IMAP_SRCS="$IMAP_SRCS $IMAP_AUTH_HTTP_SRCS"
diff --git a/auto/options b/auto/options
index ad25cc284..2960f09c3 100644
--- a/auto/options
+++ b/auto/options
@@ -64,6 +64,7 @@ HTTP_FASTCGI=YES
HTTP_STUB_STATUS=NO
IMAP=NO
+IMAP_SSL=NO
NGX_ADDONS=
@@ -141,6 +142,7 @@ do
--with-http_stub_status_module) HTTP_STUB_STATUS=YES ;;
--with-imap) IMAP=YES ;;
+ --with-imap_ssl_module) IMAP_SSL=YES ;;
--add-module=*) NGX_ADDONS="$NGX_ADDONS $value" ;;
diff --git a/auto/sources b/auto/sources
index 05889f31c..806875d99 100644
--- a/auto/sources
+++ b/auto/sources
@@ -346,6 +346,10 @@ IMAP_SRCS="src/imap/ngx_imap.c \
src/imap/ngx_imap_handler.c \
src/imap/ngx_imap_parse.c"
+IMAP_SSL_MODULE="ngx_imap_ssl_module"
+IMAP_SSL_DEPS="src/imap/ngx_imap_ssl_module.h"
+IMAP_SSL_SRCS="src/imap/ngx_imap_ssl_module.c"
+
IMAP_AUTH_HTTP_MODULE="ngx_imap_auth_http_module"
IMAP_AUTH_HTTP_SRCS="src/imap/ngx_imap_auth_http_module.c"