diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-03-23 13:14:51 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-03-23 13:14:51 +0000 |
| commit | 52859f2f1309fc8452f1cf182b712ae2d72bc40c (patch) | |
| tree | f87d424675f857d0dcebdc80ce3828389d75a69b /auto | |
| parent | 1af7090b5091ebbee1cd9354fe8a702e601a8ce0 (diff) | |
| download | nginx-52859f2f1309fc8452f1cf182b712ae2d72bc40c.tar.gz nginx-52859f2f1309fc8452f1cf182b712ae2d72bc40c.tar.bz2 | |
a prelimiary proxy cache support
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/modules | 12 | ||||
| -rw-r--r-- | auto/options | 4 | ||||
| -rw-r--r-- | auto/sources | 9 |
3 files changed, 13 insertions, 12 deletions
diff --git a/auto/modules b/auto/modules index 456d6e7a5..5e9d4d534 100644 --- a/auto/modules +++ b/auto/modules @@ -65,6 +65,13 @@ if [ $HTTP != YES ]; then fi +if [ $HTTP_CACHE = YES ]; then + USE_MD5=YES + have=NGX_HTTP_CACHE . auto/have + HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS" +fi + + if [ $HTTP_SSI = YES ]; then HTTP_POSTPONE=YES fi @@ -305,11 +312,6 @@ if [ $HTTP_UPSTREAM_IP_HASH = YES ]; then HTTP_SRCS="$HTTP_SRCS $HTTP_UPSTREAM_IP_HASH_SRCS" fi -# STUB -#USE_MD5=YES -#HTTP_SRCS="$HTTP_SRCS $HTTP_CACHE_SRCS" -#HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS" - if [ $HTTP_STUB_STATUS = YES ]; then have=NGX_STAT_STUB . auto/have HTTP_MODULES="$HTTP_MODULES ngx_http_stub_status_module" diff --git a/auto/options b/auto/options index e90e15abb..8ec692e7d 100644 --- a/auto/options +++ b/auto/options @@ -52,6 +52,7 @@ NGX_HTTP_CLIENT_TEMP_PATH= NGX_HTTP_PROXY_TEMP_PATH= NGX_HTTP_FASTCGI_TEMP_PATH= +HTTP_CACHE=YES HTTP_CHARSET=YES HTTP_GZIP=YES HTTP_SSL=NO @@ -165,6 +166,8 @@ do --with-ipv6) NGX_IPV6=YES ;; --without-http) HTTP=NO ;; + --without-http-cache) HTTP_CACHE=NO ;; + --http-log-path=*) NGX_HTTP_LOG_PATH="$value" ;; --http-client-body-temp-path=*) NGX_HTTP_CLIENT_TEMP_PATH="$value" ;; --http-proxy-temp-path=*) NGX_HTTP_PROXY_TEMP_PATH="$value" ;; @@ -337,6 +340,7 @@ cat << END files --without-http disable HTTP server + --without-http-cache disable HTTP cache --with-mail enable POP3/IMAP4/SMTP proxy module --with-mail_ssl_module enable ngx_mail_ssl_module diff --git a/auto/sources b/auto/sources index 1c063d12c..4c14634de 100644 --- a/auto/sources +++ b/auto/sources @@ -33,8 +33,7 @@ CORE_DEPS="src/core/nginx.h \ src/core/ngx_cycle.h \ src/core/ngx_conf_file.h \ src/core/ngx_resolver.h \ - src/core/ngx_open_file_cache.h \ - src/core/ngx_garbage_collector.h" + src/core/ngx_open_file_cache.h" CORE_SRCS="src/core/nginx.c \ @@ -62,8 +61,7 @@ CORE_SRCS="src/core/nginx.c \ src/core/ngx_cpuinfo.c \ src/core/ngx_conf_file.c \ src/core/ngx_resolver.c \ - src/core/ngx_open_file_cache.c \ - src/core/ngx_garbage_collector.c" + src/core/ngx_open_file_cache.c" REGEX_DEPS=src/core/ngx_regex.h @@ -254,8 +252,6 @@ HTTP_MODULES="ngx_http_module \ ngx_http_log_module \ ngx_http_upstream_module" -HTTP_CACHE_MODULE=ngx_http_cache_module - HTTP_WRITE_FILTER_MODULE="ngx_http_write_filter_module" HTTP_HEADER_FILTER_MODULE="ngx_http_header_filter_module" @@ -313,7 +309,6 @@ HTTP_SRCS="$HTTP_SRCS src/http/ngx_http_busy_lock.c" HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c -HTTP_CACHE_SRCS=src/http/ngx_http_cache.c HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c |