You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/01/15 15:56:20 UTC
svn commit: r1652120 - in /openmeetings:
branches/3.0.x/WebContent/swf10/networkTesting/networktesting.lzx
trunk/singlewebapp/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx
Author: solomax
Date: Thu Jan 15 14:56:20 2015
New Revision: 1652120
URL: http://svn.apache.org/r1652120
Log:
[OPENMEETINGS-1146] rtmps port is used in case of secure connection
Modified:
openmeetings/branches/3.0.x/WebContent/swf10/networkTesting/networktesting.lzx
openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx
Modified: openmeetings/branches/3.0.x/WebContent/swf10/networkTesting/networktesting.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/swf10/networkTesting/networktesting.lzx?rev=1652120&r1=1652119&r2=1652120&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/swf10/networkTesting/networktesting.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/swf10/networkTesting/networktesting.lzx Thu Jan 15 14:56:20 2015
@@ -89,7 +89,7 @@
if (!canvas.rtmpHost) {
canvas.rtmpHost = getBrowserHost();
}
- canvas.setAttribute("rtmpPort", settingsPtr.xpathQuery("config/rtmpport/text()"));
+ canvas.setAttribute("rtmpPort", settingsPtr.xpathQuery("config/" + (useSSL ? "rtmpsslport" : "rtmpport") + "/text()"));
canvas.setAttribute("httpProtocol", settingsPtr.xpathQuery("config/protocol/text()"));
canvas.setAttribute("httpHost", settingsPtr.xpathQuery("config/httphostlocal/text()"));
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx?rev=1652120&r1=1652119&r2=1652120&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/src/main/swf10/networkTesting/networktesting.lzx Thu Jan 15 14:56:20 2015
@@ -89,7 +89,7 @@
if (!canvas.rtmpHost) {
canvas.rtmpHost = getBrowserHost();
}
- canvas.setAttribute("rtmpPort", settingsPtr.xpathQuery("config/rtmpport/text()"));
+ canvas.setAttribute("rtmpPort", settingsPtr.xpathQuery("config/" + (useSSL ? "rtmpsslport" : "rtmpport") + "/text()"));
canvas.setAttribute("httpProtocol", settingsPtr.xpathQuery("config/protocol/text()"));
canvas.setAttribute("httpHost", settingsPtr.xpathQuery("config/httphostlocal/text()"));