X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=lua.c;h=aa27ec0837f40e2e9c714acdb02fb51562000fb8;hp=7cc05d9e0b798cff55d2553e039d5668c6576b14;hb=b965b8cc10f094ec0408d57b1bc9aeee0bca501c;hpb=9d49fe82fd7f57b340004f6fc62dd4509e528931

diff --git a/lua.c b/lua.c
index 7cc05d9..aa27ec0 100644
--- a/lua.c
+++ b/lua.c
@@ -1,23 +1,22 @@
 /*
  * uhttpd - Tiny single-threaded httpd
  *
- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-
 #include <libubox/blobmsg.h>
 #include <lua.h>
 #include <lauxlib.h>
@@ -145,7 +144,7 @@ static lua_State *uh_lua_state_init(void)
 	lua_State *L;
 	int ret;
 
-	L = lua_open();
+	L = luaL_newstate();
 	luaL_openlibs(L);
 
 	/* build uhttpd api table */
@@ -219,7 +218,8 @@ static void lua_main(struct client *cl, struct path_info *pi, char *url)
 	path_len = strlen(url);
 	str = strchr(url, '?');
 	if (str) {
-		pi->query = str;
+		if (*(str + 1))
+			pi->query = str + 1;
 		path_len = str - url;
 	}
 	if (path_len > prefix_len) {
@@ -281,6 +281,7 @@ static bool check_lua_url(const char *url)
 }
 
 static struct dispatch_handler lua_dispatch = {
+	.script = true,
 	.check_url = check_lua_url,
 	.handle_request = lua_handle_request,
 };