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.

CHANGES.txt

@@ -1,6 +1,20 @@
 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
+--------------------
+
+* **NOTE** : 0.6.0 will break existing code that sub-classes WebsocketProxy
+* Refactor to use standard SocketServer RequestHandler design
+* Fix zombie process bug on certain systems when using multiprocessing
+* Add better unit tests
+* Log information via python `logging` module
+
 0.5.1 - Jun 27, 2013
 --------------------
 

README.md

@@ -8,6 +8,28 @@ to normal socket traffic. Websockify accepts the WebSockets handshake,
 parses it, and then begins forwarding traffic between the client and
 the target in both directions.
 
+### News/help/contact
+
+Notable commits, announcements and news are posted to
+<a href="http://www.twitter.com/noVNC">@noVNC</a>
+
+If you are a websockify developer/integrator/user (or want to be)
+please join the <a
+href="https://groups.google.com/forum/?fromgroups#!forum/novnc">noVNC/websockify
+discussion group</a>
+
+Bugs and feature requests can be submitted via [github
+issues](https://github.com/kanaka/websockify/issues).
+
+If you want to show appreciation for websockify you could donate to a great
+non-profits such as: [Compassion
+International](http://www.compassion.com/), [SIL](http://www.sil.org),
+[Habitat for Humanity](http://www.habitat.org), [Electronic Frontier
+Foundation](https://www.eff.org/), [Against Malaria
+Foundation](http://www.againstmalaria.com/), [Nothing But
+Nets](http://www.nothingbutnets.net/), etc. Please tweet <a
+href="http://www.twitter.com/noVNC">@noVNC</a> if you do.
+
 ### WebSockets binary data
 
 Starting with websockify 0.5.0, only the HyBi / IETF

other/js/package.json

@@ -3,7 +3,7 @@
   "name": "websockify",
   "description": "websockify is a WebSocket-to-TCP proxy/bridge",
   "license": "LGPL-3",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/kanaka/websockify.git"

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.5.1'
+version = '0.6.1'
 name = 'websockify'
 long_description = open("README.md").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

websockify/websocket.py

@@ -581,7 +581,8 @@ class WebSocketServer(object):
         self.timeout        = timeout
         self.idle_timeout   = idle_timeout
         self.traffic        = traffic
-        
+        self.file_only      = file_only
+
         self.launch_time    = time.time()
         self.ws_connection  = False
         self.handler_id     = 1
@@ -618,7 +619,10 @@ class WebSocketServer(object):
                 self.listen_host, self.listen_port)
         self.msg("  - Flash security policy server")
         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 os.path.exists(self.cert):
                 self.msg("  - SSL/TLS support")
@@ -913,21 +917,17 @@ class WebSocketServer(object):
         original_signals = {
             signal.SIGINT: signal.getsignal(signal.SIGINT),
             signal.SIGTERM: signal.getsignal(signal.SIGTERM),
+            signal.SIGCHLD: signal.getsignal(signal.SIGCHLD),
         }
-        if getattr(signal, 'SIGCHLD', None) is not None:
-            original_signals[signal.SIGCHLD] = signal.getsignal(signal.SIGCHLD),
-
         signal.signal(signal.SIGINT, self.do_SIGINT)
         signal.signal(signal.SIGTERM, self.do_SIGTERM)
-
-        if getattr(signal, 'SIGCHLD', None) is not None:
-            if not multiprocessing:
-                # os.fork() (python 2.4) child reaper
-                signal.signal(signal.SIGCHLD, self.fallback_SIGCHLD)
-            else:
-                # make sure that _cleanup is called when children die
-                # by calling active_children on SIGCHLD
-                signal.signal(signal.SIGCHLD, self.multiprocessing_SIGCHLD)
+        if not multiprocessing:
+            # os.fork() (python 2.4) child reaper
+            signal.signal(signal.SIGCHLD, self.fallback_SIGCHLD)
+        else:
+            # make sure that _cleanup is called when children die
+            # by calling active_children on SIGCHLD
+            signal.signal(signal.SIGCHLD, self.multiprocessing_SIGCHLD)
 
         last_active_time = self.launch_time
         try: