Merge branch 'master' of github.com:diaspora/diaspora

COPYRIGHT

-Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed under the Affero General Public License version 3, the text of which can be found in GNU-AGPL-3.0, unless otherwise noted.  Components of Diaspora, including Rails, JQuery, and Devise, are licensed under the MIT/X11 license.  Blueprint-CSS is licensed under a modified version of the MIT/X11 license.  All unmodified files from these and other sources retain their original copyright and license notices: see the relevand individual files.  Attribution information for Diaspora is contained in the AUTHORS file.
+Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed under the Affero General Public License version 3, the text of which can be found in GNU-AGPL-3.0, unless otherwise noted.  Components of Diaspora, including Rails, JQuery, and Devise, are licensed under the MIT/X11 license.  Blueprint-CSS is licensed under a modified version of the MIT/X11 license.  All unmodified files from these and other sources retain their original copyright and license notices: see the relevant individual files.  Attribution information for Diaspora is contained in the AUTHORS file.

app/views/js/_websocket_js.haml

@@ -9,7 +9,7 @@
   $(document).ready(function(){
     function debug(str){ $("#debug").append("<p>" +  str); };
 
-    ws = new WebSocket("ws://#{request.host}:8080/#{CGI::escape(current_user.id.to_s)}");
+    ws = new WebSocket("ws://#{request.host}:#{APP_CONFIG[:socket_port]}/#{CGI::escape(current_user.id.to_s)}");
 
   //Attach onmessage to websocket
     ws.onmessage = function(evt) {