emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httpd: avoid extra stat() calls for "GET /dirname/" case

Browse Source 
function                                             old     new   delta
parse_conf                                          1325    1332      +7
handle_incoming_and_exit                            2173    2161     -12
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 7/-12)              Total: -5 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2021-05-04 21:25:16 +02:00
parent 1c69817885
commit 5b34a5594c
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
networking/httpd.c
View File

@@ -679,7 +679,7 @@ enum {
SIGNALED_PARSE = 1, /* path will be "/etc" */ SIGNALED_PARSE = 1, /* path will be "/etc" */
SUBDIR_PARSE = 2, /* path will be derived from URL */ SUBDIR_PARSE = 2, /* path will be derived from URL */
}; };
static void parse_conf(const char *path, int flag) static int parse_conf(const char *path, int flag)
{ {
/* internally used extra flag state */ /* internally used extra flag state */
enum { TRY_CURDIR_PARSE = 3 }; enum { TRY_CURDIR_PARSE = 3 };
@@ -713,7 +713,7 @@ static void parse_conf(const char *path, int flag)
while ((f = fopen_for_read(filename)) == NULL) { while ((f = fopen_for_read(filename)) == NULL) {
if (flag >= SUBDIR_PARSE) { /* SUBDIR or TRY_CURDIR */ if (flag >= SUBDIR_PARSE) { /* SUBDIR or TRY_CURDIR */
/* config file not found, no changes to config */ /* config file not found, no changes to config */
return; return -1;
} }
if (flag == FIRST_PARSE) { if (flag == FIRST_PARSE) {
/* -c CONFFILE given, but CONFFILE doesn't exist? */ /* -c CONFFILE given, but CONFFILE doesn't exist? */
@@ -971,6 +971,7 @@ static void parse_conf(const char *path, int flag)
} /* while (fgets) */ } /* while (fgets) */
fclose(f); fclose(f);
return 0;
} }
#if ENABLE_FEATURE_HTTPD_ENCODE_URL_STR #if ENABLE_FEATURE_HTTPD_ENCODE_URL_STR
@@ -2363,12 +2364,9 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
while ((tptr = strchr(tptr + 1, '/')) != NULL) { while ((tptr = strchr(tptr + 1, '/')) != NULL) {
/* have path1/path2 */ /* have path1/path2 */
*tptr = '\0'; *tptr = '\0';
//TODO: can we avoid is_directory() test here? /* may have subdir config */
if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) { if (parse_conf(urlcopy + 1, SUBDIR_PARSE) == 0)
/* may have subdir config */
parse_conf(urlcopy + 1, SUBDIR_PARSE);
if_ip_denied_send_HTTP_FORBIDDEN_and_exit(remote_ip); if_ip_denied_send_HTTP_FORBIDDEN_and_exit(remote_ip);
}
*tptr = '/'; *tptr = '/';
} }
@@ -2420,9 +2418,9 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
else if (urlp[-1] == '/') { else if (urlp[-1] == '/') {
/* It's a dir URL and there is no index.html /* It's a dir URL and there is no index.html
* Try cgi-bin/index.cgi */ * Try cgi-bin/index.cgi */
if (access("/cgi-bin/index.cgi"+1, X_OK) == 0) { if (access("/cgi-bin/index.cgi"+1, X_OK) != 0)
cgi_type = CGI_INDEX; send_headers_and_exit(HTTP_NOT_FOUND);
} cgi_type = CGI_INDEX;
} }
#endif #endif
urlp[0] = '\0'; urlp[0] = '\0';