From 108b617eef8394daa4b07d36b9a1c4635434f546 Mon Sep 17 00:00:00 2001 From: Joel Martin Date: Wed, 13 Jul 2011 13:01:03 -0500 Subject: [PATCH] Note kumina license, and link to kumina blog post. Ed Schouten blog article: http://blog.kumina.nl/2011/06/proxying-and-multiplexing-novnc-using-wsproxy/ Also, clarify external code licenses. --- LICENSE.txt | 7 +++++-- other/README.md | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index c8242fe..916a77a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,8 +1,11 @@ websockify is licensed under the LGPL version 3 (see docs/LICENSE.GPL-3 and docs/LICENSE.LGPL-3) with the following exceptions: - include/base64.js : Dual GPL-2 or LGPL-2.1 + include/base64.js : Choice of MIT 1.1, GPL-2 or LGPL-2.1 include/web-socket-js/ : New BSD license. Source code at - http://github.com/gimite/web-socket-js + https://github.com/gimite/web-socket-js + other/kumina.c : Simplified BSD license (2 clause). + Original source at + https://github.com/kumina/wsproxy diff --git a/other/README.md b/other/README.md index fefb29f..bccfe49 100644 --- a/other/README.md +++ b/other/README.md @@ -21,7 +21,10 @@ of websockify. ### Description -The upstream source of kumina is here: https://github.com/kumina/wsproxy +The upstream source of the kumina proxy is [here](https://github.com/kumina/wsproxy). + +[This article](http://blog.kumina.nl/2011/06/proxying-and-multiplexing-novnc-using-wsproxy/) +describes the kumina proxy. kumina is an application that can be run from inetd, which allows noVNC to connect to an unmodified libvncserver. Furthermore, it makes use of