BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apply post-1.14.3 fixes; bump version to 1.14.4 

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
1_14_stable 1_14_4
Denys Vlasenko 2009-09-12 17:49:22 +02:00
parent f5d4bddfbe
commit 757e46252c
4 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 14
SUBLEVEL = 3
SUBLEVEL = 4
EXTRAVERSION =
NAME = Unnamed

1
modutils/modprobe-small.c
View File

@ -218,6 +218,7 @@ static void parse_module(module_info *info, const char *pathname)
bksp(); /* remove last ' ' */
appendc('\0');
info->aliases = copy_stringbuf();
replace(info->aliases, '-', '_');
/* "dependency1 depandency2" */
reset_stringbuf();

32
networking/httpd.c
View File

@ -2101,8 +2101,12 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
}
send_cgi_and_exit(urlcopy, prequest, length, cookie, content_type);
}
#endif
if (urlp[-1] == '/')
strcpy(urlp, index_page);
if (stat(tptr, &sb) == 0) {
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
{
char *suffix = strrchr(tptr, '.');
if (suffix) {
Htaccess *cur;
@ -2112,16 +2116,7 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
}
}
}
}
#endif
if (prequest != request_GET && prequest != request_HEAD) {
send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
}
#endif /* FEATURE_HTTPD_CGI */
if (urlp[-1] == '/')
strcpy(urlp, index_page);
if (stat(tptr, &sb) == 0) {
file_size = sb.st_size;
last_mod = sb.st_mtime;
}
@ -2135,19 +2130,18 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
send_cgi_and_exit("/cgi-bin/index.cgi", prequest, length, cookie, content_type);
}
}
#endif
/* else {
* fall through to send_file, it errors out if open fails
* }
*/
/* else fall through to send_file, it errors out if open fails: */
if (prequest != request_GET && prequest != request_HEAD) {
/* POST for files does not make sense */
send_headers_and_exit(HTTP_NOT_IMPLEMENTED);
}
send_file_and_exit(tptr,
#if ENABLE_FEATURE_HTTPD_CGI
(prequest != request_HEAD ? SEND_HEADERS_AND_BODY : SEND_HEADERS)
#else
SEND_HEADERS_AND_BODY
#endif
);
#else
send_file_and_exit(tptr, SEND_HEADERS_AND_BODY);
#endif
}
/*

2
shell/ash.c
View File

@ -5786,7 +5786,7 @@ argstr(char *p, int flag, struct strlist *var_str_list)
};
const char *reject = spclchars;
int c;
int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */
int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */
int breakall = flag & EXP_WORD;
int inquotes;
size_t length;