Changeset feb0c3 for server/src/http/modules/ngx_http_autoindex_module.c

Timestamp:

02/03/09 19:54:45 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

master-v0.6, nginx-v0.6

Children:

209e69, 6c857c, e8c363f79fad03918abb189d5a026fd0cd6d14f4

Parents:

60af37

git-author:

George Potapov <nephrite@…> (02/03/09 19:54:45)

git-committer:

George Potapov <nephrite@…> (02/03/09 19:54:45)

Message:

vendor drop nginx 0.6.35

File:

• server/src/http/modules/ngx_http_autoindex_module.c (modified) (3 diffs)

server/src/http/modules/ngx_http_autoindex_module.c

@@ -136 +136 @@
     u_char                         *last, *filename, scale;
     off_t                           length;
-    size_t                          len, copy, allocated, root;
+    size_t                          len, utf_len, allocated, root;
     ngx_tm_t                        tm;
     ngx_err_t                       err;
@@ -330 +330 @@
 
         if (r->utf8) {
-            entry->utf_len = ngx_utf_length(entry->name.data, entry->name.len);
+            entry->utf_len = ngx_utf8_length(entry->name.data, entry->name.len);
         } else {
             entry->utf_len = len;
@@ -413 +413 @@
         len = entry[i].utf_len;
 
-        if (entry[i].name.len - len) {
+        if (entry[i].name.len != len) {
             if (len > NGX_HTTP_AUTOINDEX_NAME_LEN) {
-                copy = NGX_HTTP_AUTOINDEX_NAME_LEN - 3 + 1;
+                utf_len = NGX_HTTP_AUTOINDEX_NAME_LEN - 3 + 1;
 
             } else {
-                copy = NGX_HTTP_AUTOINDEX_NAME_LEN + 1;
+                utf_len = NGX_HTTP_AUTOINDEX_NAME_LEN + 1;
             }
 
-            b->last = ngx_utf_cpystrn(b->last, entry[i].name.data, copy);
+            b->last = ngx_utf8_cpystrn(b->last, entry[i].name.data,
+                                       utf_len, entry[i].name.len + 1);
             last = b->last;