From: Steven Barth <steven@midlink.org>
Date: Fri, 11 Sep 2009 10:46:06 +0000 (+0000)
Subject: Fix requestpath, export authuser
X-Git-Tag: 0.10.0~1141
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9b50dd9cba080ffd37a427e080785d56e2bba5c9;p=oweals%2Fluci.git

Fix requestpath, export authuser
---

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 6d4433975..ad4f24dc7 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -208,7 +208,7 @@ function dispatch(request)
 		end
 	end
 
-	ctx.requestpath = freq
+	ctx.requestpath = ctx.requestpath or freq
 	ctx.path = preq
 
 	if track.i18n then
@@ -306,6 +306,7 @@ function dispatch(request)
 					end
 					luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url())
 					ctx.authsession = sid
+					ctx.authuser = user
 				end
 			else
 				luci.http.status(403, "Forbidden")
@@ -313,6 +314,7 @@ function dispatch(request)
 			end
 		else
 			ctx.authsession = sess
+			ctx.authuser = user
 		end
 	end