Bug 5459 - Make vendordrop structure for websockify
: Make vendordrop structure for websockify
Status: NEW
: ThinLinc
Web Access
: trunk
: PC Unknown
: P2 Normal
: MediumPrio
Assigned To:
  Show dependency treegraph
Reported: 2015-03-05 11:46 by
Modified: 2016-06-29 17:08 (History)
Acceptance Criteria:



You need to log in before you can comment on or make changes to this bug.

Description From cendio 2015-03-05 11:46:48

Websockify was removed from noVNC as of this commit. Currently we are running a
quite old version of websocket.py which is the only file we use directly from
the websockify project. We should set up so that we can do vendordrops from
websockify just as we can with noVNC.

------- Comment #1 From cendio 2015-06-18 13:43:21 -------
There are files living in both noVNC and websockify upstreams and there is no
official consensus yet as to which project owns which files. Due to this we
don't think we would benefit from adding infrastructure for this atm.
------- Comment #2 From cendio 2016-06-20 15:00:57 -------
This isn't true anymore. The Websockify project is now the only proper upstream
for these files.
------- Comment #4 From cendio 2016-06-20 15:42:58 -------
NEVER MIND! /webaccess/noVNC/include/websock.js still lives in both the noVNC
project and Websockify.. There seems to be more shared files in include.
------- Comment #5 From cendio 2016-06-29 14:04:58 -------
It is correct that there's some confusion over files such as websock.js.
However, for websocket.py, it is clear that the websockify project is the only
upstream. This file is no longer a part of the noVNC project. It is also still
true that we are using this file, and that we are lagging behind. This is
suboptimal. This means that we are not getting bug fixes or work such as Python
3 compatibility. See
https://github.com/kanaka/websockify/commits/master/websockify/websocket.py .

Without a vendordrop structure, it's also difficult to see our own changes.
r31509 does some changes that have not been pushed upstream, though.