uhttpd: add support for enforcing https

Also set HTTPS environment variable for CGI programs on SSL connections.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 45852
owl
Jo-Philipp Wich 2015-05-30 20:55:14 +00:00
parent b34988d5d0
commit 4f58248a7d
3 changed files with 7 additions and 2 deletions

View File

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd PKG_NAME:=uhttpd
PKG_VERSION:=2015-05-30 PKG_VERSION:=2015-05-31
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=618493e378e2239f0d30902e47adfa134e649fdc PKG_SOURCE_VERSION:=a91aac9419f535f067ac17c16475912062d947ea
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
PKG_LICENSE:=ISC PKG_LICENSE:=ISC

View File

@ -9,6 +9,9 @@ config uhttpd main
list listen_https 0.0.0.0:443 list listen_https 0.0.0.0:443
list listen_https [::]:443 list listen_https [::]:443
# Redirect HTTP requests to HTTPS if possible
option redirect_https 1
# Server document root # Server document root
option home /www option home /www

View File

@ -126,6 +126,8 @@ start_instance()
procd_append_param command -s "$listen" procd_append_param command -s "$listen"
done done
} }
append_bool "$cfg" redirect_https "-q" 0
} }
procd_close_instance procd_close_instance