Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
mongoose
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
esp
mongoose
Commits
743f48b8
Commit
743f48b8
authored
Aug 08, 2013
by
Sergey Lyubka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added mg_exec_lua_script, mg_prepare_lua_environment -> prepare_lua_environment
parent
421c16b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
3 deletions
+33
-3
mod_lua.c
mod_lua.c
+32
-2
unit_test.c
test/unit_test.c
+1
-1
No files found.
mod_lua.c
View file @
743f48b8
...
@@ -242,7 +242,7 @@ static int lsp_redirect(lua_State *L) {
...
@@ -242,7 +242,7 @@ static int lsp_redirect(lua_State *L) {
return
0
;
return
0
;
}
}
void
mg_
prepare_lua_environment
(
struct
mg_connection
*
conn
,
lua_State
*
L
)
{
static
void
prepare_lua_environment
(
struct
mg_connection
*
conn
,
lua_State
*
L
)
{
const
struct
mg_request_info
*
ri
=
mg_get_request_info
(
conn
);
const
struct
mg_request_info
*
ri
=
mg_get_request_info
(
conn
);
extern
void
luaL_openlibs
(
lua_State
*
);
extern
void
luaL_openlibs
(
lua_State
*
);
int
i
;
int
i
;
...
@@ -296,6 +296,36 @@ void mg_prepare_lua_environment(struct mg_connection *conn, lua_State *L) {
...
@@ -296,6 +296,36 @@ void mg_prepare_lua_environment(struct mg_connection *conn, lua_State *L) {
"debug.traceback(e, 1)) end"
);
"debug.traceback(e, 1)) end"
);
}
}
static
int
lua_error_handler
(
lua_State
*
L
)
{
lua_getglobal
(
L
,
"mg"
);
if
(
!
lua_isnil
(
L
,
-
1
))
{
luaL_dostring
(
L
,
"mg.write(debug.traceback())"
);
}
else
{
printf
(
"Lua error: [%s]
\n
"
,
lua_isstring
(
L
,
-
2
)
?
lua_tostring
(
L
,
-
2
)
:
"unknown error"
);
luaL_dostring
(
L
,
"print(debug.traceback())"
);
}
return
0
;
}
void
mg_exec_lua_script
(
struct
mg_connection
*
conn
,
const
char
*
path
,
const
char
*
buf
,
int
buf_size
)
{
lua_State
*
L
;
if
(
path
!=
NULL
&&
(
L
=
luaL_newstate
())
!=
NULL
)
{
prepare_lua_environment
(
conn
,
L
);
lua_pushcclosure
(
L
,
&
lua_error_handler
,
0
);
if
(
buf
!=
NULL
)
{
luaL_loadbuffer
(
L
,
buf
,
buf_size
,
path
);
}
else
{
luaL_loadfile
(
L
,
path
);
}
lua_pcall
(
L
,
0
,
0
,
-
2
);
lua_close
(
L
);
}
}
static
void
lsp_send_err
(
struct
mg_connection
*
conn
,
struct
lua_State
*
L
,
static
void
lsp_send_err
(
struct
mg_connection
*
conn
,
struct
lua_State
*
L
,
const
char
*
fmt
,
...)
{
const
char
*
fmt
,
...)
{
char
buf
[
MG_BUF_LEN
];
char
buf
[
MG_BUF_LEN
];
...
@@ -333,7 +363,7 @@ static int handle_lsp_request(struct mg_connection *conn, const char *path,
...
@@ -333,7 +363,7 @@ static int handle_lsp_request(struct mg_connection *conn, const char *path,
}
else
{
}
else
{
// We're not sending HTTP headers here, Lua page must do it.
// We're not sending HTTP headers here, Lua page must do it.
if
(
ls
==
NULL
)
{
if
(
ls
==
NULL
)
{
mg_
prepare_lua_environment
(
conn
,
L
);
prepare_lua_environment
(
conn
,
L
);
if
(
conn
->
ctx
->
callbacks
.
init_lua
!=
NULL
)
{
if
(
conn
->
ctx
->
callbacks
.
init_lua
!=
NULL
)
{
conn
->
ctx
->
callbacks
.
init_lua
(
conn
,
L
);
conn
->
ctx
->
callbacks
.
init_lua
(
conn
,
L
);
}
}
...
...
test/unit_test.c
View file @
743f48b8
...
@@ -554,7 +554,7 @@ static void test_lua(void) {
...
@@ -554,7 +554,7 @@ static void test_lua(void) {
&
conn
.
request_info
);
&
conn
.
request_info
);
conn
.
content_len
=
conn
.
data_len
-
conn
.
request_len
;
conn
.
content_len
=
conn
.
data_len
-
conn
.
request_len
;
mg_
prepare_lua_environment
(
&
conn
,
L
);
prepare_lua_environment
(
&
conn
,
L
);
ASSERT
(
lua_gettop
(
L
)
==
0
);
ASSERT
(
lua_gettop
(
L
)
==
0
);
check_lua_expr
(
L
,
"'hi'"
,
"hi"
);
check_lua_expr
(
L
,
"'hi'"
,
"hi"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment