nginx: src/http/modules/ngx_http_autoindex

merge r2890, r2891, r2892: refactor ngx_http_charset_header_filter()

comparison

equal deleted inserted replaced

-:2be2a0ac25c5
+:042124063e3d
 ngx_err_t                       err;
 ngx_buf_t                      *b;
 ngx_int_t                       rc, size;
 ngx_str_t                       path;
 ngx_dir_t                       dir;
-ngx_uint_t                      i, level;
+ngx_uint_t                      i, level, utf8;
 ngx_pool_t                     *pool;
 ngx_time_t                     *tp;
 ngx_chain_t                     out;
 ngx_array_t                     entries;
 ngx_http_autoindex_entry_t     *entry;
 return rc;
 }
 filename = path.data;
 filename[path.len] = '/';
+if (r->headers_out.charset.len == 5
+&& ngx_strncasecmp(r->headers_out.charset.data, (u_char *) "utf-8", 5)
+== 0)
+{
+utf8 = 1;
+} else {
+utf8 = 0;
+}
 for ( ;; ) {
 ngx_set_errno(0);
 if (ngx_read_dir(&dir) == NGX_ERROR) {
 ngx_cpystrn(entry->name.data, ngx_de_name(&dir), len + 1);
 entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len,
 NGX_ESCAPE_HTML);
-if (r->utf8) {
+if (utf8) {
 entry->utf_len = ngx_utf8_length(entry->name.data, entry->name.len);
 } else {
 entry->utf_len = len;
 }

Mercurial > hg > nginx