mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Update luci-base to latest version

Browse source
This commit is contained in:
Ycarus 2018-05-25 14:12:54 +02:00
parent 75c70fa721
commit b108aa9789
39 changed files with 2518 additions and 693 deletions
Download patch file Download diff file Expand all files Collapse all files

10
luci-base/luasrc/dispatcher.lua
View file

@ -182,6 +182,7 @@ local function session_retrieve(sid, allowed_users)
(not allowed_users or
util.contains(allowed_users, sdat.values.username))
then
uci:set_session_id(sid)
return sid, sdat.values
end
@ -357,7 +358,7 @@ function dispatch(request)
elseif key == "REQUEST_URI" then
return build_url(unpack(ctx.requestpath))
elseif key == "FULL_REQUEST_URI" then
local url = { http.getenv("SCRIPT_NAME"), http.getenv("PATH_INFO") }
local url = { http.getenv("SCRIPT_NAME") or "" , http.getenv("PATH_INFO") }
local query = http.getenv("QUERY_STRING")
if query and #query > 0 then
url[#url+1] = "?"
@ -428,7 +429,9 @@ function dispatch(request)
return
end
http.header("Set-Cookie", 'sysauth=%s; path=%s' %{ sid, build_url() })
http.header("Set-Cookie", 'sysauth=%s; path=%s; HttpOnly%s' %{
sid, build_url(), http.getenv("HTTPS") == "on" and "; secure" or ""
})
http.redirect(build_url(unpack(ctx.requestpath)))
end
@ -882,6 +885,8 @@ local function _cbi(self, ...)
local pageaction = true
local parsechain = { }
local is_rollback, time_remaining = uci:rollback_pending()
for i, res in ipairs(maps) do
if res.apply_needed and res.parsechain then
local c
@ -909,6 +914,7 @@ local function _cbi(self, ...)
res:render({
firstmap = (i == 1),
applymap = applymap,
confirmmap = (is_rollback and time_remaining or nil),
redirect = redirect,
messages = messages,
pageaction = pageaction,