diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-12-02 18:40:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-12-02 18:40:46 +0000 |
| commit | 42b12b34fa74c15cfb1746d71cde949f3d5807ef (patch) | |
| tree | c44cd3f35d794e6e2be01d516e72737464f76fff /src/http/modules/ngx_http_index_handler.c | |
| parent | 4e7b11b02bd42ed284a5f006a13b0635fc33d556 (diff) | |
| download | nginx-42b12b34fa74c15cfb1746d71cde949f3d5807ef.tar.gz nginx-42b12b34fa74c15cfb1746d71cde949f3d5807ef.zip | |
nginx-0.1.11-RELEASE importrelease-0.1.11
*) Feature: the worker_priority directive.
*) Change: both tcp_nopush and tcp_nodelay directives affect the
transferred response.
*) Bugfix: nginx did not call initgroups().
Thanks to Andrew Sitnikov and Andrei Nigmatulin.
*) Change: now the ngx_http_autoindex_module shows the file size in the
bytes.
*) Bugfix: the ngx_http_autoindex_module returned the 500 error if the
broken symlink was in a directory.
*) Bugfix: the files bigger than 4G could not be transferred using
sendfile.
*) Bugfix: if the backend was resolved to several backends and there
was an error while the response waiting then process may got caught
in an endless loop.
*) Bugfix: the worker process may exit with the "unknown cycle" message
when the /dev/poll method was used.
*) Bugfix: "close() channel failed" errors.
*) Bugfix: the autodetection of the "nobody" and "nogroup" groups.
*) Bugfix: the send_lowat directive did not work on Linux.
*) Bugfix: the segmentation fault occurred if there was no events
section in configuration.
*) Bugfix: nginx could not be built on OpenBSD.
*) Bugfix: the double slashes in "://" in the URI were converted to
":/".
Diffstat (limited to 'src/http/modules/ngx_http_index_handler.c')
| -rw-r--r-- | src/http/modules/ngx_http_index_handler.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_index_handler.c b/src/http/modules/ngx_http_index_handler.c index 3386953bd..74ccf0ae1 100644 --- a/src/http/modules/ngx_http_index_handler.c +++ b/src/http/modules/ngx_http_index_handler.c @@ -448,8 +448,7 @@ static char *ngx_http_index_merge_loc_conf(ngx_conf_t *cf, ngx_http_index_loc_conf_t *prev = parent; ngx_http_index_loc_conf_t *conf = child; - ngx_uint_t i; - ngx_str_t *index, *prev_index; + ngx_str_t *index; if (conf->max_index_len == 0) { if (prev->max_index_len != 0) { @@ -465,6 +464,8 @@ static char *ngx_http_index_merge_loc_conf(ngx_conf_t *cf, return NGX_CONF_OK; } +#if 0 + if (prev->max_index_len != 0) { prev_index = prev->indices.elts; @@ -476,6 +477,8 @@ static char *ngx_http_index_merge_loc_conf(ngx_conf_t *cf, } } +#endif + if (conf->max_index_len < prev->max_index_len) { conf->max_index_len = prev->max_index_len; } |