diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-10-12 16:49:16 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-10-12 16:49:16 +0000 |
| commit | 0a280a3fc081877bc45cbdc0511a8cc42675213c (patch) | |
| tree | b5ea17e3be5eab555cf40f6304338a88bd641527 /src/core | |
| parent | b3e73d869ecef9248468e0ccc2d7d0abdbee495c (diff) | |
| download | nginx-0a280a3fc081877bc45cbdc0511a8cc42675213c.tar.gz nginx-0a280a3fc081877bc45cbdc0511a8cc42675213c.zip | |
nginx-0.0.1-2003-10-12-20:49:16 import
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 1 | ||||
| -rw-r--r-- | src/core/ngx_modules.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index dce1a5d15..98404a023 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -688,7 +688,6 @@ static void ngx_clean_old_cycles(ngx_event_t *ev) ngx_add_timer(ev, 30000); } else { - ngx_cleaner_event.timer_set = 0; ngx_destroy_pool(ngx_temp_pool); ngx_temp_pool = NULL; ngx_old_cycles.nelts = 0; diff --git a/src/core/ngx_modules.c b/src/core/ngx_modules.c index 85bcfa014..d7268c9eb 100644 --- a/src/core/ngx_modules.c +++ b/src/core/ngx_modules.c @@ -38,8 +38,8 @@ extern ngx_module_t ngx_http_not_modified_filter_module; extern ngx_module_t ngx_http_range_filter_module; extern ngx_module_t ngx_http_charset_filter_module; -extern ngx_module_t ngx_http_index_module; extern ngx_module_t ngx_http_static_module; +extern ngx_module_t ngx_http_index_module; extern ngx_module_t ngx_http_proxy_module; extern ngx_module_t ngx_http_log_module; @@ -89,8 +89,8 @@ ngx_module_t *ngx_modules[] = { /* &ngx_http_ssi_filter_module, */ &ngx_http_charset_filter_module, - &ngx_http_index_module, /* &ngx_http_static_module, */ + &ngx_http_index_module, &ngx_http_proxy_module, &ngx_http_log_module, |