apply post-1.14.3 fixes; bump version to 1.14.4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/Makefile b/Makefile
index 9e1bd876e76ee4e033f1f58f05f9e6032d0dd102..f907eaae8f19f690846e927168a84497ca946ab4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 1
 PATCHLEVEL = 14
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 NAME = Unnamed
 

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 6ee0164c25b1c6a041a8b418f72d10918ec3ab1c..0b3a19a27a48e54cfb5b748a10c396859f9c22d0 100644 (file)
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -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();

diff --git a/networking/httpd.c b/networking/httpd.c
index de4fb9b39beafcc17e1f7a155b42641b899d2dfe..ae9116913f1d2e4773f45b1c1a22afa7291b6ae0 100644 (file)
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -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
+       send_file_and_exit(tptr, SEND_HEADERS_AND_BODY);
 #endif
-       );
 }
 
 /*

diff --git a/shell/ash.c b/shell/ash.c
index 4981f4ce0cc520662517568eb5b2b41c3e2eb293..f753a5bae30829d27329fc29669191d1711a5647 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -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;