Merge branch 'master' into django_example

examples/flask_chat/templates/latency.html

@@ -23,7 +23,7 @@
           }
           send();
       });
-      socket.on('pong', function() {
+      socket.on('pong_from_server', function() {
           var latency = new Date - last;
           $('#latency').text(latency + 'ms');
           if (time)
@@ -39,7 +39,7 @@
       var last;
       function send() {
           last = new Date;
-          socket.emit('ping');
+          socket.emit('ping_from_client');
           $('#transport').text(socket.io.engine.transport.name);
       }
 

setup.py

@@ -12,7 +12,7 @@ with open('README.rst', 'r') as f:
 
 setup(
     name='python-socketio',
-    version='1.4',
+    version='1.4.1',
     url='http://github.com/miguelgrinberg/python-socketio/',
     license='MIT',
     author='Miguel Grinberg',

socketio/server.py

@@ -322,7 +322,7 @@ class Server(object):
         the Python standard library. The `start()` method on this object is
         already called by this function.
         """
-        self.eio.start_background_task(target, *args, **kwargs)
+        return self.eio.start_background_task(target, *args, **kwargs)
 
     def sleep(self, seconds=0):
         """Sleep for the requested amount of time using the appropriate async