Mercurial > hg > nginx-ranges

comparison src/http/modules/ngx_http_autoindex_module.c @ 505:f39b9e29530d NGINX_0_8_0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.0 *) Feature: the "keepalive_requests" directive. *) Feature: the "limit_rate_after" directive. Thanks to Ivan Debnar. *) Bugfix: XLST filter did not work in subrequests. *) Bugfix: in relative paths handling in nginx/Windows. *) Bugfix: in proxy_store, fastcgi_store, proxy_cache, and fastcgi_cache in nginx/Windows. *) Bugfix: in memory allocation error handling. Thanks to Maxim Dounin and Kirill A. Korinskiy.
author Igor Sysoev <http://sysoev.ru>
date Tue, 02 Jun 2009 00:00:00 +0400
parents 98143f74eb3d
children 8246d8a2c2be
comparison
equal deleted inserted replaced
504:6d9fb4461113 505:f39b9e29530d
143 ngx_err_t err; 143 ngx_err_t err;
144 ngx_buf_t *b; 144 ngx_buf_t *b;
145 ngx_int_t rc, size; 145 ngx_int_t rc, size;
146 ngx_str_t path; 146 ngx_str_t path;
147 ngx_dir_t dir; 147 ngx_dir_t dir;
148 ngx_uint_t i, level; 148 ngx_uint_t i, level, utf8;
149 ngx_pool_t *pool; 149 ngx_pool_t *pool;
150 ngx_time_t *tp; 150 ngx_time_t *tp;
151 ngx_chain_t out; 151 ngx_chain_t out;
152 ngx_array_t entries; 152 ngx_array_t entries;
153 ngx_http_autoindex_entry_t *entry; 153 ngx_http_autoindex_entry_t *entry;
249 return rc; 249 return rc;
250 } 250 }
251 251
252 filename = path.data; 252 filename = path.data;
253 filename[path.len] = '/'; 253 filename[path.len] = '/';
254
255 if (r->headers_out.charset.len == 5
256 && ngx_strncasecmp(r->headers_out.charset.data, (u_char *) "utf-8", 5)
257 == 0)
258 {
259 utf8 = 1;
260
261 } else {
262 utf8 = 0;
263 }
254 264
255 for ( ;; ) { 265 for ( ;; ) {
256 ngx_set_errno(0); 266 ngx_set_errno(0);
257 267
258 if (ngx_read_dir(&dir) == NGX_ERROR) { 268 if (ngx_read_dir(&dir) == NGX_ERROR) {
333 ngx_cpystrn(entry->name.data, ngx_de_name(&dir), len + 1); 343 ngx_cpystrn(entry->name.data, ngx_de_name(&dir), len + 1);
334 344
335 entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len, 345 entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len,
336 NGX_ESCAPE_HTML); 346 NGX_ESCAPE_HTML);
337 347
338 if (r->utf8) { 348 if (utf8) {
339 entry->utf_len = ngx_utf8_length(entry->name.data, entry->name.len); 349 entry->utf_len = ngx_utf8_length(entry->name.data, entry->name.len);
340 } else { 350 } else {
341 entry->utf_len = len; 351 entry->utf_len = len;
342 } 352 }
343 353
620 { 630 {
621 ngx_http_autoindex_loc_conf_t *conf; 631 ngx_http_autoindex_loc_conf_t *conf;
622 632
623 conf = ngx_palloc(cf->pool, sizeof(ngx_http_autoindex_loc_conf_t)); 633 conf = ngx_palloc(cf->pool, sizeof(ngx_http_autoindex_loc_conf_t));
624 if (conf == NULL) { 634 if (conf == NULL) {
625 return NGX_CONF_ERROR; 635 return NULL;
626 } 636 }
627 637
628 conf->enable = NGX_CONF_UNSET; 638 conf->enable = NGX_CONF_UNSET;
629 conf->localtime = NGX_CONF_UNSET; 639 conf->localtime = NGX_CONF_UNSET;
630 conf->exact_size = NGX_CONF_UNSET; 640 conf->exact_size = NGX_CONF_UNSET;