2 Commits

Author SHA1 Message Date
Solly Ross cd4bc7590e Update to 0.6.1
This is a minor patch release which fixes the functionality of
the file_only parameter and prevents uninteded directory listings.
2015-05-11 10:35:55 -04:00
Solly Ross d626fed76a Restore functionaltiy to file_only
There was a bug in WebSocketServer that prevented the `file_only`
parameter from actually being set as an instance property, causing
directory listings to appear even with `file_only=True`.  This
commit fixes that.

See-Also: https://bugs.launchpad.net/nova/+bug/1447675

Conflicts:
	websockify/websocket.py
2015-05-11 10:30:49 -04:00
4 changed files with 13 additions and 4 deletions
+5
View File
@@ -1,6 +1,11 @@
Changes Changes
======= =======
0.6.1 - May 11, 2015
--------------------
* **PATCH RELEASE**: Fixes a bug causing file_only to not be passed properly
0.6.0 - Feb 18, 2014 0.6.0 - Feb 18, 2014
-------------------- --------------------
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "websockify", "name": "websockify",
"description": "websockify is a WebSocket-to-TCP proxy/bridge", "description": "websockify is a WebSocket-to-TCP proxy/bridge",
"license": "LGPL-3", "license": "LGPL-3",
"version": "0.6.0", "version": "0.6.1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/kanaka/websockify.git" "url": "git://github.com/kanaka/websockify.git"
+1 -1
View File
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = '0.6.0' version = '0.6.1'
name = 'websockify' name = 'websockify'
long_description = open("README.md").read() + "\n" + \ long_description = open("README.md").read() + "\n" + \
open("CHANGES.txt").read() + "\n" open("CHANGES.txt").read() + "\n"
+5 -1
View File
@@ -581,6 +581,7 @@ class WebSocketServer(object):
self.timeout = timeout self.timeout = timeout
self.idle_timeout = idle_timeout self.idle_timeout = idle_timeout
self.traffic = traffic self.traffic = traffic
self.file_only = file_only
self.launch_time = time.time() self.launch_time = time.time()
self.ws_connection = False self.ws_connection = False
@@ -618,7 +619,10 @@ class WebSocketServer(object):
self.listen_host, self.listen_port) self.listen_host, self.listen_port)
self.msg(" - Flash security policy server") self.msg(" - Flash security policy server")
if self.web: if self.web:
self.msg(" - Web server. Web root: %s", self.web) if self.file_only:
self.msg(" - Web server (no directory listings). Web root: %s", self.web)
else:
self.msg(" - Web server. Web root: %s", self.web)
if ssl: if ssl:
if os.path.exists(self.cert): if os.path.exists(self.cert):
self.msg(" - SSL/TLS support") self.msg(" - SSL/TLS support")