Author: solomax
Date: Fri May 24 07:05:09 2013
New Revision: 1485950
URL: http://svn.apache.org/r1485950
Log:
Double slash is removed from App base URL;
Red5 version is bumped;
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/build.properties
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1485950&r1=1485949&r2=1485950&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Fri May
24 07:05:09 2013
@@ -157,7 +157,11 @@
//If Port is Null or undefinied use port 80
var port = (urlObject.port != null && urlObject.port !=
undefined) ? urlObject.port : 80;
//if($debug) Debug.write("getBaseUrl:: [urlObject, port]",
urlObject, port);
- return urlObject.protocol + "://" + urlObject.host + (port !=
80 ? ":" + port : "") + urlObject.path + "swf";
+ var url = "" + urlObject.protocol + "://" + urlObject.host +
(port != 80 ? ":" + port : "") + urlObject.path;
+ //if($debug) Debug.write("!!!!!!! getBaseUrl:: [urlObject,
port, url]", urlObject, port, url);
+ url = url + (url.slice(-1) == '/' ? '' : '/') + "swf";
+ //if($debug) Debug.write("!!!!!!! getBaseUrl:: [last, url]",
url.slice(-1), url);
+ return url;
]]>
</method>
Modified: openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1485950&r1=1485949&r2=1485950&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Fri May 24 07:05:09 2013
@@ -13,8 +13,8 @@ project.version=3.0.0
project.status=SNAPSHOT
ivy.install.version=2.3.0
maven.version=3.0.4
-red5.server.revision=4639
-red5.client.revision=4639
+red5.server.revision=4646
+red5.client.revision=4646
red5.server.version=1.0.2-SNAPSHOT
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
