Merge branch 'release-0.24'

Author: longsleep

debian/changelog

@@ -1,3 +1,17 @@
+spreed-webrtc-server (0.24.5) trusty; urgency=medium
+
+  * Updated ua-parser to 0.7.9.
+  * Fixed errors in unit tests.
+  * Added Apache HTTPD example configuration.
+  * Fixed a problem where Firefox did not release media permissions.
+  * More use of track API instead of stream API.
+  * SignalingState changes are now triggered as event.
+  * Fixed a problem where Firefox did not start the call when media permission was denied.
+  * Fixed a problem where streams could not be started when they were disabled when call was started and server has renegotiation disabled.
+  * Fixed a problem where the renegotiation shrine was ignored.
+
+ -- Simon Eisenmann <[email protected]>  Fri, 07 Aug 2015 16:08:14 +0200
+
 spreed-webrtc-server (0.24.4) precise; urgency=low
 
   * Updated German translations.

doc/APACHE.txt

@@ -0,0 +1,30 @@
+## Apache HTTP Server configuration for Spreed WebRTC
+
+Apache supports websocket proxy starting with 2.4.5.
+
+Make sure you have the module mod_proxy_wstunnel enabled. In addition proxy,
+proxy_http and headers modules have to be enabled. On Ubuntu this goes like
+this: `a2enmod proxy proxy_http proxy_wstunnel headers`
+
+Then add the following lines to your VirtualHost section:
+
+  <Location />
+      ProxyPass http://127.0.0.1:8080/
+      ProxyPassReverse /
+  </Location>
+
+  <Location /ws>
+      ProxyPass ws://127.0.0.1:8080/ws
+  </Location>
+
+  ProxyVia On
+  ProxyPreserveHost On
+  RequestHeader set X-Forwarded-Proto 'https' env=HTTPS
+
+Thats it.
+
+--
+(c)2015 struktur AG
+
+
+

doc/NGINX.txt

@@ -1,49 +1,48 @@
-A few notes on Nginx configuration
-
-  In general Nginx with websocket support is required 
-  (I am using Nginx 1.4). It should work with Nginx 1.3 too.
-
-  Add the following to your Nginx server section:
-
-    location / {
-	proxy_pass http://localhost:8090;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-	proxy_set_header X-Forwarded-Proto $scheme;
-	proxy_set_header Host $http_host;
-	proxy_set_header X-Real-IP $remote_addr;
-	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-
-  This is using a map to provide the Upgrade and Connection 
-  headers to the backend server. You need to add this map to 
-  the http section of your server:
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
-
-  Also make sure that you have the general proxy configuration 
-  like this in place:
-
-	proxy_buffering             on;
-	proxy_ignore_client_abort   off;
-	proxy_redirect              off;
-	proxy_connect_timeout       90;
-	proxy_send_timeout          90;
-	proxy_read_timeout          90;
-	proxy_buffer_size           4k;
-	proxy_buffers               4 32k;
-	proxy_busy_buffers_size     64k;
-	proxy_temp_file_write_size  64k;
-	proxy_next_upstream error timeout invalid_header http_502 http_503 http_504;
-
-  Thats it.
-
-  --
-  (c)2013 struktur AG
+## Nginx HTTP server configuration for Spreed WebRTC
+
+In general Nginx with websocket support is required (Nginx >= 1.3).
+
+Add the following to your Nginx server section:
+
+  location / {
+    proxy_pass http://localhost:8090;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $connection_upgrade;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+
+This is using a map to provide the Upgrade and Connection
+headers to the backend server. You need to add this map to
+the http section of your server:
+
+  map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+  }
+
+Also make sure that you have the general proxy configuration
+like this in place:
+
+  proxy_buffering             on;
+  proxy_ignore_client_abort   off;
+  proxy_redirect              off;
+  proxy_connect_timeout       90;
+  proxy_send_timeout          90;
+  proxy_read_timeout          90;
+  proxy_buffer_size           4k;
+  proxy_buffers               4 32k;
+  proxy_busy_buffers_size     64k;
+  proxy_temp_file_write_size  64k;
+  proxy_next_upstream error timeout invalid_header http_502 http_503 http_504;
+
+And thats it.
+
+--
+(c)2013 struktur AG
 
 
 

src/app/spreed-webrtc-server/room_manager_test.go

@@ -26,7 +26,9 @@ import (
 )
 
 func NewTestRoomManager() (RoomManager, *Config) {
-	config := &Config{}
+	config := &Config{
+		roomTypeDefault: "Room",
+	}
 	return NewRoomManager(config, nil), config
 }
 

static/js/controllers/uicontroller.js

@@ -454,7 +454,7 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web
 		var reconnect = function() {
 			if (appData.flags.connected && appData.flags.autoreconnect) {
 				if (appData.flags.resurrect === null) {
-					// Storage data at the resurrection shrine.
+					// Store data at the resurrection shrine.
 					appData.flags.resurrect = {
 						status: $scope.getStatus(),
 						id: $scope.id