diff options
author | Pierre Ossman <ossman@cendio.se> | 2018-10-09 10:23:59 +0200 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2018-10-09 10:25:17 +0200 |
commit | 4a4453fc69cf56f9991a13a62023969dcf5b8a4f (patch) | |
tree | dc89029e8a2b9976ce2f47ae5c50bdcf86bd277a /unix/xserver/hw/vnc/vncExtInit.cc | |
parent | 2b69d385e669bf97d872fd116c7f1da5aee7cdfd (diff) | |
download | tigervnc-4a4453fc69cf56f9991a13a62023969dcf5b8a4f.tar.gz tigervnc-4a4453fc69cf56f9991a13a62023969dcf5b8a4f.zip |
Remove Java web server
Applets don't work anymore so remove everything that has to do
with serving them.
Diffstat (limited to 'unix/xserver/hw/vnc/vncExtInit.cc')
-rw-r--r-- | unix/xserver/hw/vnc/vncExtInit.cc | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc index d6f6b742..286a04f6 100644 --- a/unix/xserver/hw/vnc/vncExtInit.cc +++ b/unix/xserver/hw/vnc/vncExtInit.cc @@ -73,10 +73,6 @@ struct CaseInsensitiveCompare { typedef std::set<std::string, CaseInsensitiveCompare> ParamSet; static ParamSet allowOverrideSet; -rfb::StringParameter httpDir("httpd", - "Directory containing files to serve via HTTP", - ""); -rfb::IntParameter httpPort("httpPort", "TCP port to listen for HTTP",0); rfb::AliasParameter rfbwait("rfbwait", "Alias for ClientWaitTimeMillis", &rfb::Server::clientWaitTimeMillis); rfb::IntParameter rfbport("rfbport", "TCP port to listen for RFB protocol",0); @@ -177,7 +173,6 @@ void vncExtensionInit(void) if (!desktop[scr]) { std::list<network::SocketListener*> listeners; - std::list<network::SocketListener*> httpListeners; if (scr == 0 && vncInetdSock != -1) { if (network::isSocketListening(vncInetdSock)) { @@ -214,21 +209,6 @@ void vncExtensionInit(void) vlog.info("Listening for VNC connections on %s interface(s), port %d", localhostOnly ? "local" : (const char*)interface, port); - - CharArray httpDirStr(httpDir.getData()); - if (httpDirStr.buf[0]) { - port = httpPort; - if (port == 0) port = 5800 + atoi(vncGetDisplay()); - port += 1000 * scr; - if (localhostOnly) - network::createLocalTcpListeners(&httpListeners, port); - else - network::createTcpListeners(&httpListeners, addr, port); - - vlog.info("Listening for HTTP connections on %s interface(s), port %d", - localhostOnly ? "local" : (const char*)interface, - port); - } } CharArray desktopNameStr(desktopName.getData()); @@ -237,7 +217,6 @@ void vncExtensionInit(void) vncSetGlueContext(scr); desktop[scr] = new XserverDesktop(scr, listeners, - httpListeners, desktopNameStr.buf, pf, vncGetScreenWidth(), |