Mercurial > hg > nginx

comparison src/http/modules/ngx_http_autoindex_module.c @ 2472:d7d3a72c07d8 stable-0.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r2121, r2126 merge: *) fix utf-8 names in autoindex *) rename ngx_utf_...() to ngx_utf8_...()
author Igor Sysoev <igor@sysoev.ru>
date Mon, 26 Jan 2009 15:09:55 +0000
parents bf5521329069
children 976e000dbb9f
comparison
equal deleted inserted replaced
2471:92488f6e80db 2472:d7d3a72c07d8
133 static ngx_int_t 133 static ngx_int_t
134 ngx_http_autoindex_handler(ngx_http_request_t *r) 134 ngx_http_autoindex_handler(ngx_http_request_t *r)
135 { 135 {
136 u_char *last, *filename, scale; 136 u_char *last, *filename, scale;
137 off_t length; 137 off_t length;
138 size_t len, copy, allocated, root; 138 size_t len, utf_len, allocated, root;
139 ngx_tm_t tm; 139 ngx_tm_t tm;
140 ngx_err_t err; 140 ngx_err_t err;
141 ngx_buf_t *b; 141 ngx_buf_t *b;
142 ngx_int_t rc, size; 142 ngx_int_t rc, size;
143 ngx_str_t path; 143 ngx_str_t path;
327 327
328 entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len, 328 entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len,
329 NGX_ESCAPE_HTML); 329 NGX_ESCAPE_HTML);
330 330
331 if (r->utf8) { 331 if (r->utf8) {
332 entry->utf_len = ngx_utf_length(entry->name.data, entry->name.len); 332 entry->utf_len = ngx_utf8_length(entry->name.data, entry->name.len);
333 } else { 333 } else {
334 entry->utf_len = len; 334 entry->utf_len = len;
335 } 335 }
336 336
337 entry->dir = ngx_de_is_dir(&dir); 337 entry->dir = ngx_de_is_dir(&dir);
410 *b->last++ = '"'; 410 *b->last++ = '"';
411 *b->last++ = '>'; 411 *b->last++ = '>';
412 412
413 len = entry[i].utf_len; 413 len = entry[i].utf_len;
414 414
415 if (entry[i].name.len - len) { 415 if (entry[i].name.len != len) {
416 if (len > NGX_HTTP_AUTOINDEX_NAME_LEN) { 416 if (len > NGX_HTTP_AUTOINDEX_NAME_LEN) {
417 copy = NGX_HTTP_AUTOINDEX_NAME_LEN - 3 + 1; 417 utf_len = NGX_HTTP_AUTOINDEX_NAME_LEN - 3 + 1;
418 418
419 } else { 419 } else {
420 copy = NGX_HTTP_AUTOINDEX_NAME_LEN + 1; 420 utf_len = NGX_HTTP_AUTOINDEX_NAME_LEN + 1;
421 } 421 }
422 422
423 b->last = ngx_utf_cpystrn(b->last, entry[i].name.data, copy); 423 b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
424 utf_len, entry[i].name.len + 1);
424 last = b->last; 425 last = b->last;
425 426
426 } else { 427 } else {
427 b->last = ngx_cpystrn(b->last, entry[i].name.data, 428 b->last = ngx_cpystrn(b->last, entry[i].name.data,
428 NGX_HTTP_AUTOINDEX_NAME_LEN + 1); 429 NGX_HTTP_AUTOINDEX_NAME_LEN + 1);