X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=lua.c;h=c6f27e91a56df3503f7f06c5e228e6aa9e54e9a0;hp=e404addef01d41444de4533b6df2a3d4ad62efbe;hb=ac7670faba12e23b8ec7e866dcfe1d98d3921b40;hpb=b949545598eaa75b38b4d57c9aea6216bd82256c

diff --git a/lua.c b/lua.c
index e404add..c6f27e9 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>
@@ -89,6 +88,19 @@ static int uh_lua_recv(lua_State *L)
 	}
 }
 
+static int uh_lua_send(lua_State *L)
+{
+	const char *buf;
+	size_t len;
+
+	buf = luaL_checklstring(L, 1, &len);
+	if (len > 0)
+		len = write(STDOUT_FILENO, buf, len);
+
+	lua_pushnumber(L, len);
+	return 1;
+}
+
 static int
 uh_lua_strconvert(lua_State *L, int (*convert)(char *, int, const char *, int))
 {
@@ -138,13 +150,10 @@ static lua_State *uh_lua_state_init(void)
 	/* build uhttpd api table */
 	lua_newtable(L);
 
-	/* 
-	 * use print as send and sendc implementation,
-	 * chunked transfer is handled in the main server
-	 */
-	lua_getglobal(L, "print");
-	lua_pushvalue(L, -1);
-	lua_setfield(L, -3, "send");
+	lua_pushcfunction(L, uh_lua_send);
+	lua_setfield(L, -2, "send");
+
+	lua_pushcfunction(L, uh_lua_send);
 	lua_setfield(L, -2, "sendc");
 
 	lua_pushcfunction(L, uh_lua_recv);
@@ -190,13 +199,15 @@ error:
 	return NULL;
 }
 
-static void lua_main(struct client *cl, struct path_info *pi, const char *url)
+static void lua_main(struct client *cl, struct path_info *pi, char *url)
 {
+	struct blob_attr *cur;
 	const char *error;
 	struct env_var *var;
 	lua_State *L = _L;
 	int path_len, prefix_len;
 	char *str;
+	int rem;
 
 	lua_getglobal(L, UH_LUA_CB);
 
@@ -227,6 +238,13 @@ static void lua_main(struct client *cl, struct path_info *pi, const char *url)
 	lua_pushnumber(L, 0.9 + (cl->request.version / 10.0));
 	lua_setfield(L, -2, "HTTP_VERSION");
 
+	lua_newtable(L);
+	blob_for_each_attr(cur, cl->hdr.head, rem) {
+		lua_pushstring(L, blobmsg_data(cur));
+		lua_setfield(L, -2, blobmsg_name(cur));
+	}
+	lua_setfield(L, -2, "headers");
+
 	switch(lua_pcall(L, 1, 0, 0)) {
 	case LUA_ERRMEM:
 	case LUA_ERRRUN:
@@ -242,7 +260,7 @@ static void lua_main(struct client *cl, struct path_info *pi, const char *url)
 	exit(0);
 }
 
-static void lua_handle_request(struct client *cl, const char *url, struct path_info *pi)
+static void lua_handle_request(struct client *cl, char *url, struct path_info *pi)
 {
 	static struct path_info _pi;
 
@@ -262,6 +280,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,
 };