[vlc-commits] commit: Put http alias back from LUA to native ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 29 14:09:38 2010 +0300| [6bb9f29967cdcc2401fb64c81623b6324c795ecf] | committer: Rémi Denis-Courmont 

Put http alias back from LUA to native

The LUA interface is unmaintained, enough waiting.
Works around #3623, #3627, #3687, #3691.
(cherry picked from commit 1834c5a73ecf97c33e385c5f837af72a48a8672d)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=6bb9f29967cdcc2401fb64c81623b6324c795ecf
---

 modules/control/http/http.c |    1 +
 modules/misc/lua/intf.c     |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index bd6de15..b731916 100644
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -84,6 +84,7 @@ vlc_module_begin ()
         add_string ( "http-intf-crl",  NULL, NULL, CRL_TEXT,  CRL_LONGTEXT,  true )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
+    add_shortcut( "http" )
 vlc_module_end ()
 
 
diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 1ceca46..86bec16 100644
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -78,7 +78,6 @@ static const struct
     { "luatelnet", "telnet" },
     { "telnet", "telnet" },
     { "luahttp", "http" },
-    { "http", "http" },
     { NULL, NULL } };
 
 static const char *WordInList( const char *psz_list, const char *psz_word )