IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix colon in file name for ngx_http_autoindex_module

Browse Source
This commit is contained in:
Igor Sysoev 2009-05-17 19:01:23 +00:00
parent 640e3a49d5
commit 7f20c49059
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/http/modules/ngx_http_autoindex_module.c
View File

@ -25,8 +25,11 @@ typedef struct {
typedef struct { typedef struct {
ngx_str_t name; ngx_str_t name;
size_t utf_len; size_t utf_len;
ngx_uint_t escape; size_t escape;
ngx_uint_t dir;
unsigned dir:1;
unsigned colon:1;
time_t mtime; time_t mtime;
off_t size; off_t size;
} ngx_http_autoindex_entry_t; } ngx_http_autoindex_entry_t;
@ -338,6 +341,8 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
entry->utf_len = len; entry->utf_len = len;
} }
entry->colon = (ngx_strchr(entry->name.data, ':') != NULL);
entry->dir = ngx_de_is_dir(&dir); entry->dir = ngx_de_is_dir(&dir);
entry->mtime = ngx_de_mtime(&dir); entry->mtime = ngx_de_mtime(&dir);
entry->size = ngx_de_size(&dir); entry->size = ngx_de_size(&dir);
@ -363,7 +368,7 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
+ entry[i].name.len + entry[i].escape + entry[i].name.len + entry[i].escape
+ 1 /* 1 is for "/" */ + 1 /* 1 is for "/" */
+ sizeof("\">") - 1 + sizeof("\">") - 1
+ entry[i].name.len - entry[i].utf_len + entry[i].name.len - entry[i].utf_len + entry[i].colon * 2
+ NGX_HTTP_AUTOINDEX_NAME_LEN + sizeof(">") - 2 + NGX_HTTP_AUTOINDEX_NAME_LEN + sizeof(">") - 2
+ sizeof("</a>") - 1 + sizeof("</a>") - 1
+ sizeof(" 28-Sep-1970 12:00 ") - 1 + sizeof(" 28-Sep-1970 12:00 ") - 1
@ -396,6 +401,11 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
for (i = 0; i < entries.nelts; i++) { for (i = 0; i < entries.nelts; i++) {
b->last = ngx_cpymem(b->last, "<a href=\"", sizeof("<a href=\"") - 1); b->last = ngx_cpymem(b->last, "<a href=\"", sizeof("<a href=\"") - 1);
if (entry[i].colon) {
*b->last++ = '.';
*b->last++ = '/';
}
if (entry[i].escape) { if (entry[i].escape) {
ngx_escape_uri(b->last, entry[i].name.data, entry[i].name.len, ngx_escape_uri(b->last, entry[i].name.data, entry[i].name.len,
NGX_ESCAPE_HTML); NGX_ESCAPE_HTML);