From a31bf7777694d794d8e861c2bfede4a8ebb8849e Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@matrix.org>
Date: Thu, 25 Sep 2014 11:24:49 +0200
Subject: Make turn server endpoint return an empty object if no turn servers
 to match the normal response. Don't break if the turn_uris option isn't
 present.

---
 synapse/rest/voip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'synapse/rest')

diff --git a/synapse/rest/voip.py b/synapse/rest/voip.py
index 7260ff0e8e..2e4627606f 100644
--- a/synapse/rest/voip.py
+++ b/synapse/rest/voip.py
@@ -34,7 +34,7 @@ class VoipRestServlet(RestServlet):
         turnSecret = self.hs.config.turn_shared_secret
         userLifetime = self.hs.config.turn_user_lifetime
         if not turnUris or not turnSecret or not userLifetime:
-            defer.returnValue( (200, {"uris": []}) )
+            defer.returnValue( (200, {}) )
 
         expiry = self.hs.get_clock().time_msec() + userLifetime
         username = "%d:%s" % (expiry, auth_user.to_string())
-- 
cgit 1.4.1