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

httpd: avoid one stat() call for "GET /dirname" case

Browse Source 
function                                             old     new   delta
handle_incoming_and_exit                            2172    2173      +1

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

14
networking/httpd.c
View File

@ -2355,13 +2355,6 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
tptr++; tptr++;
} }
/* If URL is a directory, add '/' */
if (urlp[-1] != '/') {
if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) {
found_moved_temporarily = urlcopy;
}
}
/* Log it */ /* Log it */
if (verbose > 1) if (verbose > 1)
bb_error_msg("url:%s", urlcopy); bb_error_msg("url:%s", urlcopy);
@ -2370,6 +2363,7 @@ 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?
if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) { if (is_directory(urlcopy + 1, /*followlinks:*/ 1)) {
/* may have subdir config */ /* may have subdir config */
parse_conf(urlcopy + 1, SUBDIR_PARSE); parse_conf(urlcopy + 1, SUBDIR_PARSE);
@ -2401,6 +2395,11 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
strcpy(urlp, index_page); strcpy(urlp, index_page);
} }
if (stat(tptr, &sb) == 0) { if (stat(tptr, &sb) == 0) {
/* If URL is a directory with no slash, set up
* "HTTP/1.1 302 Found" "Location: /dir/" reply */
if (urlp[-1] != '/' && S_ISDIR(sb.st_mode)) {
found_moved_temporarily = urlcopy;
} else {
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
char *suffix = strrchr(tptr, '.'); char *suffix = strrchr(tptr, '.');
if (suffix) { if (suffix) {
@ -2413,7 +2412,6 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
} }
} }
#endif #endif
if (!found_moved_temporarily) {
file_size = sb.st_size; file_size = sb.st_size;
last_mod = sb.st_mtime; last_mod = sb.st_mtime;
} }