diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-12-06 14:45:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-12-06 14:45:08 +0000 |
| commit | 6a12fc91b0090b5628dc70d4a45db576c5b0c64a (patch) | |
| tree | f473f81772c058b7488ac4030c3ff09994c6c532 /src/http/modules/ngx_http_index_handler.c | |
| parent | c372e09ab34ec8c4f60f8c08ef30b297c0e475ab (diff) | |
| download | nginx-6a12fc91b0090b5628dc70d4a45db576c5b0c64a.tar.gz nginx-6a12fc91b0090b5628dc70d4a45db576c5b0c64a.zip | |
nginx-0.1.12-RELEASE importrelease-0.1.12
*) Feature: the %request_length log parameter.
*) Bugfix: when using the /dev/poll, select and poll on the platforms,
where these methods may do the false reports, there may be the long
delay when the request was passed via the keep-alive connection. It
may be at least on Solaris when using the /dev/poll.
*) Bugfix: the send_lowat directive is ignored on Linux because Linux
does not support the SO_SNDLOWAT option.
Diffstat (limited to 'src/http/modules/ngx_http_index_handler.c')
| -rw-r--r-- | src/http/modules/ngx_http_index_handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_index_handler.c b/src/http/modules/ngx_http_index_handler.c index 74ccf0ae1..892b825ae 100644 --- a/src/http/modules/ngx_http_index_handler.c +++ b/src/http/modules/ngx_http_index_handler.c @@ -477,12 +477,12 @@ 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; } +#endif + if (conf->index_cache == NULL) { conf->index_cache = prev->index_cache; } |