Title: [216656] branches/safari-604.1.21-branch/Source/WebCore
- Revision
- 216656
- Author
- [email protected]
- Date
- 2017-05-11 00:27:09 -0700 (Thu, 11 May 2017)
Log Message
Cherry-pick r216285. rdar://problem/32041544
Modified Paths
Diff
Modified: branches/safari-604.1.21-branch/Source/WebCore/ChangeLog (216655 => 216656)
--- branches/safari-604.1.21-branch/Source/WebCore/ChangeLog 2017-05-11 07:27:07 UTC (rev 216655)
+++ branches/safari-604.1.21-branch/Source/WebCore/ChangeLog 2017-05-11 07:27:09 UTC (rev 216656)
@@ -1,5 +1,21 @@
2017-05-10 Jason Marcell <[email protected]>
+ Cherry-pick r216285. rdar://problem/32041544
+
+ 2017-05-05 Youenn Fablet <[email protected]>
+
+ TURNS gathering is not working properly
+ https://bugs.webkit.org/show_bug.cgi?id=171747
+
+ Reviewed by Eric Carlson.
+
+ Did manual testing on real TURNS servers.
+
+ * Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp:
+ (WebCore::configurationFromMediaEndpointConfiguration): Disabling TURNS servers gathering.
+
+2017-05-10 Jason Marcell <[email protected]>
+
Cherry-pick r216258. rdar://problem/32017975
2017-05-05 Brian Burg <[email protected]>
Modified: branches/safari-604.1.21-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp (216655 => 216656)
--- branches/safari-604.1.21-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp 2017-05-11 07:27:07 UTC (rev 216655)
+++ branches/safari-604.1.21-branch/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCPeerConnectionBackend.cpp 2017-05-11 07:27:09 UTC (rev 216656)
@@ -88,9 +88,14 @@
webrtc::PeerConnectionInterface::IceServer iceServer;
iceServer.username = server.username.utf8().data();
iceServer.password = server.credential.utf8().data();
- for (auto& url : server.urls)
- iceServer.urls.push_back({ url.string().utf8().data() });
- rtcConfiguration.servers.push_back(WTFMove(iceServer));
+ for (auto& url : server.urls) {
+ // FIXME: If TURNS is failing, the whole ICE candidate gathering is failing.
+ // We should fix that and reactivate TURNS gathering.
+ if (!url.protocolIs("turns"))
+ iceServer.urls.push_back({ url.string().utf8().data() });
+ }
+ if (iceServer.urls.size())
+ rtcConfiguration.servers.push_back(WTFMove(iceServer));
}
rtcConfiguration.ice_candidate_pool_size = configuration.iceCandidatePoolSize;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
