commit 9ae143a09f4845bda4e7b8bc4e825da057a75508
author Jenkins <jenkins@review.openstack.org> Thu Apr 16 14:42:56 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Apr 16 14:42:56 2015 +0000
tree d36d74dfd14ad7a550cb2f9d1ad3f26c16d12f57
parent e0ecfcd1f7b9b09c4021b5fe11e73476e3a18431
parent 9f3f069321def036b93f6ab2b78d94ee088043c9

Merge "Enable websockets transport on Etherpad"

templates/etherpad-lite_settings.json.erb

diff --git a/templates/etherpad-lite_settings.json.erb b/templates/etherpad-lite_settings.json.erb
index 74f3522..d5effc9 100644
--- a/templates/etherpad-lite_settings.json.erb
+++ b/templates/etherpad-lite_settings.json.erb
@@ -72,7 +72,7 @@
   */
 
   // restrict socket.io transport methods
-  "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
+  "socketTransportProtocols" : ["websocket", "xhr-polling", "jsonp-polling", "htmlfile"],
 
   /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */
   "loglevel": "INFO",