From 57c30e4128a2c297a0a6b6583b87873f057bf889 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 3 Jul 2020 13:40:31 +0800 Subject: [PATCH] uhttpd: disable https redir --- include/target.mk | 2 +- package/network/services/uhttpd/Makefile | 2 +- package/network/services/uhttpd/files/uhttpd.config | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/target.mk b/include/target.mk index 9195f1fdd..536bd9173 100644 --- a/include/target.mk +++ b/include/target.mk @@ -15,7 +15,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd urandom-seed urngd \ block-mount coremark kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw wget libustream-openssl ca-certificates \ -default-settings luci luci-app-ddns luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ +default-settings luci luci-app-ddns luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot luci-app-webadmin \ luci-app-filetransfer luci-app-vsftpd luci-app-ssr-plus luci-app-unblockmusic \ luci-app-arpbind luci-app-vlmcsd luci-app-wol luci-app-ramfree \ luci-app-sfe luci-app-nlbwmon luci-app-accesscontrol luci-app-cpufreq \ diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index a595a7738..0e32ff54a 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git diff --git a/package/network/services/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config index 39089ca25..3bfc03c4a 100644 --- a/package/network/services/uhttpd/files/uhttpd.config +++ b/package/network/services/uhttpd/files/uhttpd.config @@ -5,12 +5,8 @@ config uhttpd main list listen_http 0.0.0.0:80 list listen_http [::]:80 - # HTTPS listen addresses, multiple allowed - list listen_https 0.0.0.0:443 - list listen_https [::]:443 - # Redirect HTTP requests to HTTPS if possible - option redirect_https 1 + option redirect_https 0 # Server document root option home /www