uhttpd: do lua lookup first, otherwise fs resources might shadow the virtual url
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 20 Mar 2010 14:34:50 +0000 (14:34 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 20 Mar 2010 14:34:50 +0000 (14:34 +0000)
contrib/package/uhttpd/src/uhttpd.c

index f2972a0468acc2974ef707e42ec4430e1962cb59..ccbc9efc6b2a1b6d662ce845db0740b6456f87c7 100644 (file)
@@ -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
                                                {