Commit af4529f9 authored by Anssi Piirainen's avatar Anssi Piirainen
Browse files

version 3.2.16

parent 693cea58
......@@ -20,7 +20,7 @@ deploy.dir=${site.dir}/content/swf
# 3.2.16
plugin.buildfiles=rtmp/build.xml,controls/build.xml,controls/build-tube.xml,controls/build-air.xml,controls/build-skinless.xml, \
sharing/build.xml,viralvideos/build.xml,bitrateselect/build.xml,bwcheck/build.xml, \
sharing/build.xml,viralvideos/build.xml,bitrateselect/build.xml,bwcheck/build.xml,bwcheck/build-httpstreaming.xml \
httpstreaming/build.xml,menu/build.xml,pseudostreaming/build.xml
#
#plugin.buildfiles=analytics/build.xml,audio/build.xml,bwcheck/build.xml,bwcheck/build-httpstreaming.xml \
......
......@@ -6,10 +6,10 @@
<property name="version-1" value="3"/>
<property name="version-2" value="2"/>
<property name="version-3" value="16"/>
<property name="version-status" value="dev"/>
<property name="controls-version-info" value="3.2.15-dev"/>
<property name="version-status" value=""/>
<property name="controls-version-info" value="3.2.15"/>
<property name="audio-version-info" value="3.2.10"/>
<property name="flowplayer-js-version-info" value="3.2.12-dev"/>
<property name="flowplayer-js-version-info" value="3.2.12"/>
<property name="source-dist-root-folder" value="flowplayer"/>
<property name="version-status-quoted" value="&quot;&#39;${version-status}&#39;&quot;"/>
......
......@@ -5,7 +5,7 @@
<property name="DEVKIT_HOME" value="../../../../lib/devkit"/>
<import file="${DEVKIT_HOME}/js.xml"/>
<property name="version" value="3.2.12-dev"/>
<property name="version" value="3.2.12"/>
<!-- concat -->
<target name="concat">
......
......@@ -22,7 +22,7 @@ package org.flowplayer.util {
if (stripSubdomains || domain.indexOf("www.") == 0) {
if (hasAllNumbers(domain)) {
trace("IP address in URL");
return domain;
return parseIPAddressDomain(domain);
}
domain = stripSubdomain(domain);
......@@ -41,6 +41,12 @@ package org.flowplayer.util {
return true;
}
private static function parseIPAddressDomain(domain:String):String {
var parts:Array = domain.split(".");
if (parts.length <= 2) return domain;
return parts[parts.length - 2] + "." + parts[parts.length - 1];
}
private static function isNumber(n:String):Boolean {
return !isNaN(parseFloat(n)) && isFinite(n as Number);
}
......
......@@ -80,11 +80,11 @@ package org.flowplayer.util {
public function testIPAddressDomain():void {
trace(DomainUtil.parseDomain('123.123.123.64', true));
assertEquals("123.123.123.64", DomainUtil.parseDomain('123.123.123.64', true));
assertEquals("123.64", DomainUtil.parseDomain('123.123.123.64', true));
}
public function testIPAddressDomain2():void {
assertEquals("123.123.64", DomainUtil.parseDomain('123.123.64', true));
assertEquals("123.64", DomainUtil.parseDomain('123.123.64', true));
}
public function testIPAddressDomain3():void {
......
devkit-dir=../../lib/devkit
version=3.2.13-dev
version=3.2.13
devkit-dir=../../lib/devkit
//osmf-dir=/Users/api/flex_sdk_4.5.0.19786/frameworks/libs
osmf-dir=../../lib/osmf/framework/OSMF
version=3.2.12-dev
version=3.2.12
version=3.2.15-dev
version=3.2.15
devkit-dir=../../lib/devkit
devkit-dir=../../lib/devkit
osmf-dir=../../lib/osmf/framework/OSMF
version=3.2.10-dev
version=3.2.10
devkit-dir=../../lib/devkit
version=3.2.12-dev
\ No newline at end of file
version=3.2.12
\ No newline at end of file
devkit-dir=../../lib/devkit
osmf-dir=/Users/api/code/osmf/framework/OSMF
version=3.2.12-dev
\ No newline at end of file
version=3.2.12
\ No newline at end of file
version=3.2.12-dev
version=3.2.12
devkit-dir=../../lib/devkit
\ No newline at end of file
devkit-dir=../../lib/devkit
version=3.2.14-dev
\ No newline at end of file
version=3.2.14
\ No newline at end of file
devkit-dir=../../lib/devkit
version=3.2.13-dev
\ No newline at end of file
version=3.2.13
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment