Merge commit '1_20_0' into merge

1 files changed, 4 insertions, 2 deletions

diff --git a/networking/httpd.c b/networking/httpd.c
index f233cb0ba..12218a0a3 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1594,7 +1594,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
         }
         range_len = MAXINT(off_t);
         if (range_start >= 0) {
-                if (!range_end) {
+                if (!range_end || range_end > file_size - 1) {
                         range_end = file_size - 1;
                 }
                 if (range_end < range_start
@@ -1676,7 +1676,7 @@ static int checkPermIP(void)
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
 
-# if ENABLE_FEATURE_HTTPD_AUTH_MD5 && ENABLE_PAM
+# if ENABLE_PAM
 struct pam_userinfo {
         const char *name;
         const char *pw;
@@ -1842,7 +1842,9 @@ static int check_user_passwd(const char *path, char *user_and_passwd)
 
                         if (passwd[0] == '$' && isdigit(passwd[1])) {
                                 char *encrypted;
+# if !ENABLE_PAM
  check_encrypted:
+# endif
                                 /* encrypt pwd from peer and check match with local one */
                                 encrypted = pw_encrypt(
                                         /* pwd (from peer): */  colon_after_user + 1,