change r.content_type = "something" to use ap_set_content_type, which it should as...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@748946 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index c99092c4746a5d049e204e6e39c38bd794571219..c829682114ba40026f51d53676b98c5616db3fa1 100644 (file)
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -450,46 +450,29 @@ static int req_newindex(lua_State *L)
     /* request_rec* r = lua_touserdata(L, lua_upvalueindex(1)); */
     /* const char* key = luaL_checkstring(L, -2); */
     request_rec *r = apl_check_request_rec(L, 1);
-    apl_rstack_dump(L, r, "req_newindex");
     key = luaL_checkstring(L, 2);
     apl_rstack_dump(L, r, "req_newindex");
     if (0 == apr_strnatcmp("status", key)) {
         int code = luaL_checkinteger(L, 3);
         r->status = code;
-        luaL_getmetatable(L, "Apache2.Request");
-        lua_pushinteger(L, code);
-        lua_setfield(L, -2, "status");
-        lua_pop(L, 1);
         return 0;
     }
 
     if (0 == apr_strnatcmp("content_type", key)) {
         const char *value = luaL_checkstring(L, 3);
-        r->content_type = apr_pstrdup(r->pool, value);
-        luaL_getmetatable(L, "Apache2.Request");
-        lua_pushstring(L, value);
-        lua_setfield(L, -2, "content_type");
-        lua_pop(L, 1);
+        ap_set_content_type(r, apr_pstrdup(r->pool, value));
         return 0;
     }
 
     if (0 == apr_strnatcmp("filename", key)) {
         const char *value = luaL_checkstring(L, 3);
         r->filename = apr_pstrdup(r->pool, value);
-        luaL_getmetatable(L, "Apache2.Request");
-        lua_pushstring(L, value);
-        lua_setfield(L, -2, "filename");
-        lua_pop(L, 1);
         return 0;
     }
 
     if (0 == apr_strnatcmp("uri", key)) {
         const char *value = luaL_checkstring(L, 3);
         r->uri = apr_pstrdup(r->pool, value);
-        luaL_getmetatable(L, "Apache2.Request");
-        lua_pushstring(L, value);
-        lua_setfield(L, -2, "uri");
-        lua_pop(L, 1);
         return 0;
     }
 

diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c
index 870f41a3461767b99613741d81b58d2118ddb62f..1d139a5be07a042949da73642de531cfeaa04a8c 100644 (file)
--- a/modules/lua/lua_vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -236,7 +236,8 @@ static void munge_path(lua_State *L,
                        const char *sub_pat,
                        const char *rep_pat,
                        apr_pool_t *pool,
-                       apr_array_header_t *paths, const char *file)
+                       apr_array_header_t *paths, 
+                       const char *file)
 {
     const char *current;
     const char *parent_dir;

diff --git a/modules/lua/test/htdocs/simple.lua b/modules/lua/test/htdocs/simple.lua
index f949001983367dce33bf5b499666cf272a139347..a3f8861065216ea13842214746775225710ac65f 100644 (file)
--- a/modules/lua/test/htdocs/simple.lua
+++ b/modules/lua/test/htdocs/simple.lua
@@ -1,3 +1,4 @@
 function handle(r)
-   r:puts("Hi!")
+   r.content_type = "text/plain"
+   r:puts("Hi there!")
 end