diff --git a/mongoose.c b/mongoose.c index 597d5fec..fd0e218b 100644 --- a/mongoose.c +++ b/mongoose.c @@ -1279,11 +1279,7 @@ void mg_http_serve_dir(struct mg_connection *c, struct mg_http_message *hm, #endif if (is_index && fp == NULL) { #if MG_ENABLE_DIRECTORY_LISTING - if (opts->enable_dirlist && strcmp(opts->enable_dirlist, "no") == 0) { - mg_http_reply(c, 403, "", "%s", "Denied"); - } else { - listdir(c, hm, opts, t2); - } + listdir(c, hm, opts, t2); #else mg_http_reply(c, 403, "", "%s", "Directory listing not supported"); #endif diff --git a/mongoose.h b/mongoose.h index aeb57d45..f3b2f43f 100644 --- a/mongoose.h +++ b/mongoose.h @@ -787,7 +787,6 @@ struct mg_http_serve_opts { const char *root_dir; // Web root directory, must be non-NULL const char *ssi_pattern; // SSI file name pattern, e.g. #.shtml const char *extra_headers; // Extra HTTP headers to add in responses - const char *enable_dirlist; // Enable dir listing. Set to "no" to disable }; // Parameter for mg_http_next_multipart diff --git a/src/http.c b/src/http.c index b899da32..cb1d3aea 100644 --- a/src/http.c +++ b/src/http.c @@ -868,11 +868,7 @@ void mg_http_serve_dir(struct mg_connection *c, struct mg_http_message *hm, #endif if (is_index && fp == NULL) { #if MG_ENABLE_DIRECTORY_LISTING - if (opts->enable_dirlist && strcmp(opts->enable_dirlist, "no") == 0) { - mg_http_reply(c, 403, "", "%s", "Denied"); - } else { - listdir(c, hm, opts, t2); - } + listdir(c, hm, opts, t2); #else mg_http_reply(c, 403, "", "%s", "Directory listing not supported"); #endif diff --git a/src/http.h b/src/http.h index 77c6f9f2..3cf13929 100644 --- a/src/http.h +++ b/src/http.h @@ -26,7 +26,6 @@ struct mg_http_serve_opts { const char *root_dir; // Web root directory, must be non-NULL const char *ssi_pattern; // SSI file name pattern, e.g. #.shtml const char *extra_headers; // Extra HTTP headers to add in responses - const char *enable_dirlist; // Enable dir listing. Set to "no" to disable }; // Parameter for mg_http_next_multipart diff --git a/test/unit_test.c b/test/unit_test.c index d81b3b6e..7ba0ac9a 100644 --- a/test/unit_test.c +++ b/test/unit_test.c @@ -369,7 +369,6 @@ static void eh1(struct mg_connection *c, int ev, void *ev_data, void *fn_data) { sopts.root_dir = "./test/data"; sopts.ssi_pattern = "#.shtml"; sopts.extra_headers = "C: D\r\n"; - sopts.enable_dirlist = "no"; mg_http_serve_dir(c, hm, &sopts); } } else if (ev == MG_EV_WS_MSG) { @@ -565,10 +564,6 @@ static void test_http_server(void) { ASSERT(mg_strstr(mg_str(buf), mg_str(">Index of /test/<")) != NULL); ASSERT(mg_strstr(mg_str(buf), mg_str(">fuzz.c<")) != NULL); - // Directory listing denied - ASSERT(fetch(&mgr, buf, url, "GET /secret/ HTTP/1.0\n\n") == 403); - ASSERT(cmpbody(buf, "Denied\n") == 0); - { // Credentials struct mg_http_message hm;