diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-07-16 21:11:43 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-07-16 21:11:43 +0400 |
| commit | f38e046a0a2e7437f8232ef2a99cead69c4b9ebb (patch) | |
| tree | 5d9a68d757f7994506cdb497ce43d4ddd63c7eaa /auto | |
| parent | 0ad253766fb8d62f257c446410a632a596ac5783 (diff) | |
nginx-0.0.7-2004-07-16-21:11:43 import
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/modules | 26 | ||||
| -rw-r--r-- | auto/sources | 10 |
2 files changed, 18 insertions, 18 deletions
diff --git a/auto/modules b/auto/modules index d2e2b01bc..6a5becd10 100644 --- a/auto/modules +++ b/auto/modules @@ -60,19 +60,6 @@ HTTP_FILTER_MODULES="$HTTP_WRITE_FILTER_MODULE \ $HTTP_CHUNKED_FILTER_MODULE \ $HTTP_RANGE_HEADER_FILTER_MODULE" -if [ $HTTP_SSL = YES ]; then - HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_SSL_FILTER_MODULE" - HTTP_DEPS="$HTTP_DEPS $HTTP_SSL_DEPS" - HTTP_SRCS="$HTTP_SRCS $HTTP_SSL_SRCS" - - # STUB: move to auto/libs/ssl after md5 - have=NGX_HTTP_SSL . auto/have - have=NGX_OPENSSL . auto/have - CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS" - CORE_SRCS="$CORE_SRCS $OPENSSL_SRCS" - CORE_LIBS="$CORE_LIBS -lssl -lcrypto" -fi - if [ $HTTP_GZIP = YES ]; then have=NGX_HTTP_GZIP . auto/have USE_ZLIB=YES @@ -113,6 +100,19 @@ if [ $HTTP_REWRITE = YES -a $USE_PCRE != DISABLED ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_REWRITE_SRCS" fi +if [ $HTTP_SSL = YES ]; then + HTTP_MODULES="$HTTP_MODULES $HTTP_SSL_MODULE" + HTTP_DEPS="$HTTP_DEPS $HTTP_SSL_DEPS" + HTTP_SRCS="$HTTP_SRCS $HTTP_SSL_SRCS" + + # STUB: move to auto/libs/ssl after md5 + have=NGX_HTTP_SSL . auto/have + have=NGX_OPENSSL . auto/have + CORE_DEPS="$CORE_DEPS $OPENSSL_DEPS" + CORE_SRCS="$CORE_SRCS $OPENSSL_SRCS" + CORE_LIBS="$CORE_LIBS -lssl -lcrypto" +fi + if [ $HTTP_PROXY = YES ]; then have=NGX_HTTP_PROXY . auto/have USE_MD5=YES diff --git a/auto/sources b/auto/sources index 7c8b7b33f..6b66e51b1 100644 --- a/auto/sources +++ b/auto/sources @@ -253,11 +253,6 @@ HTTP_GZIP_FILTER_MODULE=ngx_http_gzip_filter_module HTTP_GZIP_SRCS=src/http/modules/ngx_http_gzip_filter.c -HTTP_SSL_FILTER_MODULE=ngx_http_ssl_filter_module -HTTP_SSL_DEPS=src/http/modules/ngx_http_ssl_filter.h -HTTP_SSL_SRCS=src/http/modules/ngx_http_ssl_filter.c - - HTTP_SSI_FILTER_MODULE=ngx_http_ssi_filter_module HTTP_SSI_SRCS=src/http/modules/ngx_http_ssi_filter.c @@ -274,6 +269,11 @@ HTTP_REWRITE_MODULE=ngx_http_rewrite_module HTTP_REWRITE_SRCS=src/http/modules/ngx_http_rewrite_handler.c +HTTP_SSL_MODULE=ngx_http_ssl_module +HTTP_SSL_DEPS=src/http/modules/ngx_http_ssl_module.h +HTTP_SSL_SRCS=src/http/modules/ngx_http_ssl_module.c + + HTTP_PROXY_MODULE=ngx_http_proxy_module HTTP_PROXY_INCS="src/http/modules/proxy" HTTP_PROXY_DEPS=src/http/modules/proxy/ngx_http_proxy_handler.h |