Commit 97ec6344 authored by Pierre Ynard's avatar Pierre Ynard

luahttp: fix scope of url handler variables

The url handlers were declared with local scope, meaning local to the
lua script file I assume. Since the interface doesn't wait at the end
of the lua script anymore, they would fall out of scope after interface
initialization. Then, when the interface was first accessed, garbage
collection was somehow triggered, unregistering all url callbacks,
incidentally triggering a deadlock.

Fixes #6673
parent d1b7c01a
...@@ -38,7 +38,7 @@ open_tag = "<?vlc" ...@@ -38,7 +38,7 @@ open_tag = "<?vlc"
close_tag = "?>" close_tag = "?>"
-- TODO: use internal VLC mime lookup function for mimes not included here -- TODO: use internal VLC mime lookup function for mimes not included here
local mimes = { mimes = {
txt = "text/plain", txt = "text/plain",
json = "text/plain", json = "text/plain",
html = "text/html", html = "text/html",
...@@ -277,7 +277,7 @@ do ...@@ -277,7 +277,7 @@ do
end end
package.path = oldpath package.path = oldpath
end end
local files = {} files = {}
local function load_dir(dir,root) local function load_dir(dir,root)
local root = root or "/" local root = root or "/"
local has_index = false local has_index = false
...@@ -321,4 +321,4 @@ end ...@@ -321,4 +321,4 @@ end
password = vlc.var.inherit(nil,"http-password") password = vlc.var.inherit(nil,"http-password")
h = vlc.httpd() h = vlc.httpd()
load_dir( http_dir ) load_dir( http_dir )
local a = h:handler("/art",nil,password,callback_art,nil) a = h:handler("/art",nil,password,callback_art,nil)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment