Skip to content

M
mongoose
Commit 784a1580 authored by Sergey Lyubka's avatar Sergey Lyubka
Browse files
Options

Merge pull request #232 from ellusak/master 

use chunked encoding for directory listing
parents 6a0ac697 7c06279a
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 5 deletions
mongoose.c
View file @ 784a1580
...@@ -1675,6 +1675,24 @@ int mg_printf(struct mg_connection *conn, const char *fmt, ...) { ...@@ -1675,6 +1675,24 @@ int mg_printf(struct mg_connection *conn, const char *fmt, ...) {
return mg_vprintf(conn, fmt, ap); return mg_vprintf(conn, fmt, ap);
} }
int mg_chunked_printf(struct mg_connection *conn, const char *fmt, ...)
{
char mem[MG_BUF_LEN], *buf = mem;
int len;
va_list ap;
va_start(ap, fmt);
if ((len = alloc_vprintf(&buf, sizeof(mem), fmt, ap)) > 0) {
len = mg_printf(conn, "%X\r\n%s\r\n", len, buf);
}
if (buf != mem && buf != NULL) {
free(buf);
}
return len;
}
int mg_url_decode(const char *src, int src_len, char *dst, int mg_url_decode(const char *src, int src_len, char *dst,
int dst_len, int is_form_url_encoded) { int dst_len, int is_form_url_encoded) {
int i, j, a, b; int i, j, a, b;
...@@ -2642,7 +2660,7 @@ static void print_dir_entry(struct de *de) { ...@@ -2642,7 +2660,7 @@ static void print_dir_entry(struct de *de) {
strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M", strftime(mod, sizeof(mod), "%d-%b-%Y %H:%M",
localtime(&de->file.modification_time)); localtime(&de->file.modification_time));
mg_url_encode(de->file_name, href, sizeof(href)); mg_url_encode(de->file_name, href, sizeof(href));
de->conn->num_bytes_sent += mg_printf(de->conn, de->conn->num_bytes_sent += mg_chunked_printf(de->conn,
"<tr><td><a href=\"%s%s%s\">%s%s</a></td>" "<tr><td><a href=\"%s%s%s\">%s%s</a></td>"
"<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n", "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
de->conn->request_info.uri, href, de->file.is_directory ? "/" : "", de->conn->request_info.uri, href, de->file.is_directory ? "/" : "",
...@@ -2819,10 +2837,10 @@ static void handle_directory_request(struct mg_connection *conn, ...@@ -2819,10 +2837,10 @@ static void handle_directory_request(struct mg_connection *conn,
conn->must_close = 1; conn->must_close = 1;
mg_printf(conn, "%s", mg_printf(conn, "%s",
"HTTP/1.1 200 OK\r\n" "HTTP/1.1 200 OK\r\n"
"Connection: close\r\n" "Transfer-Encoding: Chunked\r\n"
"Content-Type: text/html; charset=utf-8\r\n\r\n"); "Content-Type: text/html; charset=utf-8\r\n\r\n");
conn->num_bytes_sent += mg_printf(conn, conn->num_bytes_sent += mg_chunked_printf(conn,
"<html><head><title>Index of %s</title>" "<html><head><title>Index of %s</title>"
"<style>th {text-align: left;}</style></head>" "<style>th {text-align: left;}</style></head>"
"<body><h1>Index of %s</h1><pre><table cellpadding=\"0\">" "<body><h1>Index of %s</h1><pre><table cellpadding=\"0\">"
...@@ -2834,7 +2852,7 @@ static void handle_directory_request(struct mg_connection *conn, ...@@ -2834,7 +2852,7 @@ static void handle_directory_request(struct mg_connection *conn,
sort_direction, sort_direction, sort_direction); sort_direction, sort_direction, sort_direction);
// Print first entry - link to a parent directory // Print first entry - link to a parent directory
conn->num_bytes_sent += mg_printf(conn, conn->num_bytes_sent += mg_chunked_printf(conn,
"<tr><td><a href=\"%s%s\">%s</a></td>" "<tr><td><a href=\"%s%s\">%s</a></td>"
"<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n", "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
conn->request_info.uri, "..", "Parent directory", "-", "-"); conn->request_info.uri, "..", "Parent directory", "-", "-");
...@@ -2848,7 +2866,8 @@ static void handle_directory_request(struct mg_connection *conn, ...@@ -2848,7 +2866,8 @@ static void handle_directory_request(struct mg_connection *conn,
} }
free(data.entries); free(data.entries);
conn->num_bytes_sent += mg_printf(conn, "%s", "</table></body></html>"); conn->num_bytes_sent += mg_chunked_printf(conn, "%s", "</table></body></html>");
conn->num_bytes_sent += mg_write(conn, "0\r\n\r\n", 5);
conn->status_code = 200; conn->status_code = 200;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment