Ticket #9: ng-autoindex-namelen-fixed.patch

ngx_http_autoindex_module.c

@@ -40 +40 @@
     ngx_flag_t     enable;
     ngx_flag_t     localtime;
     ngx_flag_t     exact_size;
+    ngx_uint_t     max_name_len;
 } ngx_http_autoindex_loc_conf_t;
 
 
 #define NGX_HTTP_AUTOINDEX_PREALLOCATE  50
 
-#define NGX_HTTP_AUTOINDEX_NAME_LEN     50
-
 
 static int ngx_libc_cdecl ngx_http_autoindex_cmp_entries(const void *one,
     const void *two);
@@ -81 +80 @@
       offsetof(ngx_http_autoindex_loc_conf_t, exact_size),
       NULL },
 
+    { ngx_string("autoindex_max_name_len"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
+      ngx_conf_set_size_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(ngx_http_autoindex_loc_conf_t, max_name_len),
+      NULL },
+
       ngx_null_command
 };
 
@@ -380 +386 @@
             + sizeof("\">") - 1
             + entry[i].name.len - entry[i].utf_len
             + entry[i].escape_html
-            + NGX_HTTP_AUTOINDEX_NAME_LEN + sizeof(">") - 2
+            + alcf->max_name_len + sizeof(">") - 2
             + sizeof("</a>") - 1
             + sizeof(" 28-Sep-1970 12:00 ") - 1
             + 20                                         /* the file size */
@@ -442 +448 @@
         len = entry[i].utf_len;
 
         if (entry[i].name.len != len) {
-            if (len > NGX_HTTP_AUTOINDEX_NAME_LEN) {
-                char_len = NGX_HTTP_AUTOINDEX_NAME_LEN - 3 + 1;
+            if (len > alcf->max_name_len) {
+                char_len = alcf->max_name_len - 3 + 1;
 
             } else {
-                char_len = NGX_HTTP_AUTOINDEX_NAME_LEN + 1;
+                char_len = alcf->max_name_len + 1;
             }
 
             last = b->last;
@@ -462 +468 @@
 
         } else {
             if (entry[i].escape_html) {
-                if (len > NGX_HTTP_AUTOINDEX_NAME_LEN) {
-                    char_len = NGX_HTTP_AUTOINDEX_NAME_LEN - 3;
+                if (len > alcf->max_name_len) {
+                    char_len = alcf->max_name_len - 3;
 
                 } else {
                     char_len = len;
@@ -475 +481 @@
 
             } else {
                 b->last = ngx_cpystrn(b->last, entry[i].name.data,
-                                      NGX_HTTP_AUTOINDEX_NAME_LEN + 1);
+                                      alcf->max_name_len + 1);
                 last = b->last - 3;
             }
         }
 
-        if (len > NGX_HTTP_AUTOINDEX_NAME_LEN) {
+        if (len > alcf->max_name_len) {
             b->last = ngx_cpymem(last, "..&gt;</a>", sizeof("..&gt;</a>") - 1);
 
         } else {
-            if (entry[i].dir && NGX_HTTP_AUTOINDEX_NAME_LEN - len > 0) {
+            if (entry[i].dir && alcf->max_name_len - len > 0) {
                 *b->last++ = '/';
                 len++;
             }
 
             b->last = ngx_cpymem(b->last, "</a>", sizeof("</a>") - 1);
 
-            if (NGX_HTTP_AUTOINDEX_NAME_LEN - len > 0) {
-                ngx_memset(b->last, ' ', NGX_HTTP_AUTOINDEX_NAME_LEN - len);
-                b->last += NGX_HTTP_AUTOINDEX_NAME_LEN - len;
+            if (alcf->max_name_len - len > 0) {
+                ngx_memset(b->last, ' ', alcf->max_name_len - len);
+                b->last += alcf->max_name_len - len;
             }
         }
 
@@ -667 +673 @@
     conf->enable = NGX_CONF_UNSET;
     conf->localtime = NGX_CONF_UNSET;
     conf->exact_size = NGX_CONF_UNSET;
+    conf->max_name_len = NGX_CONF_UNSET_UINT;
 
     return conf;
 }
@@ -681 +688 @@
     ngx_conf_merge_value(conf->enable, prev->enable, 0);
     ngx_conf_merge_value(conf->localtime, prev->localtime, 0);
     ngx_conf_merge_value(conf->exact_size, prev->exact_size, 1);
+    ngx_conf_merge_uint_value(conf->max_name_len, prev->max_name_len, 50);
 
     return NGX_CONF_OK;
 }