From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 20 Mar 2010 14:34:50 +0000 (+0000)
Subject: uhttpd: do lua lookup first, otherwise fs resources might shadow the virtual url
X-Git-Tag: 0.10.0~800
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=1ecf7ac9fa9499d79ccebf805090b2fd1310f3d9;ds=sidebyside

uhttpd: do lua lookup first, otherwise fs resources might shadow the virtual url
---

diff --git a/contrib/package/uhttpd/src/uhttpd.c b/contrib/package/uhttpd/src/uhttpd.c
index f2972a046..ccbc9efc6 100644
--- a/contrib/package/uhttpd/src/uhttpd.c
+++ b/contrib/package/uhttpd/src/uhttpd.c
@@ -668,6 +668,14 @@ int main (int argc, char **argv)
 					/* parse message header */
 					if( (req = uh_http_header_recv(cl)) != NULL )
 					{
+#ifdef HAVE_LUA
+						/* Lua request? */
+						if( strstr(req->url, conf.lua_prefix) == req->url )
+						{
+							uh_lua_request(cl, req, L);
+						}
+						else
+#endif
 						/* dispatch request */
 						if( (pin = uh_path_lookup(cl, req->url)) != NULL )
 						{
@@ -682,13 +690,7 @@ int main (int argc, char **argv)
 								uh_file_request(cl, req, pin);
 							}
 						}
-#ifdef HAVE_LUA
-						/* Lua request? */
-						else if( strstr(req->url, conf.lua_prefix) == req->url )
-						{
-							uh_lua_request(cl, req, L);
-						}
-#endif
+
 						/* 404 */
 						else
 						{