From: Max Semenik Date: Fri, 11 Oct 2013 15:49:04 +0000 (+0400) Subject: Blacklist Nokia's Ovi Browser from ResourceLoader X-Git-Tag: 1.31.0-rc.0~18537^2 X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=983d5a89b622501c05d9ca6517c245edd24d4f62;p=lhc%2Fweb%2Fwiklou.git Blacklist Nokia's Ovi Browser from ResourceLoader It runs scripts proxy-side much like Opera Mini does, resulting in nothing resembling a real JS engine. This causes problems and the browser is popular enough to warrant a block. Bug: 55600 Change-Id: I2c1ee78828c2b9cead4f82ef795972a4c28140b4 --- diff --git a/resources/startup.js b/resources/startup.js index 6fa8b3c89a..b6a27d2d50 100644 --- a/resources/startup.js +++ b/resources/startup.js @@ -39,7 +39,9 @@ function isCompatible( ua ) { // Any NetFront based browser ua.match( /NetFront/ ) || // Opera Mini, all versions - ua.match( /Opera Mini/ ) + ua.match( /Opera Mini/ ) || + // Nokia's Ovi Browser + ua.match( /S40OviBrowser/ ) ); } diff --git a/tests/qunit/suites/resources/startup.test.js b/tests/qunit/suites/resources/startup.test.js index 57825c5071..76f32f7e6e 100644 --- a/tests/qunit/suites/resources/startup.test.js +++ b/tests/qunit/suites/resources/startup.test.js @@ -68,7 +68,10 @@ 'Opera/9.80 (J2ME/MIDP; Opera Mini/3.1.10423/22.387; U; en) Presto/2.5.25 Version/10.54', 'Opera/9.50 (J2ME/MIDP; Opera Mini/4.0.10031/298; U; en)', 'Opera/9.80 (J2ME/MIDP; Opera Mini/6.24093/26.1305; U; en) Presto/2.8.119 Version/10.54', - 'Opera/9.80 (Android; Opera Mini/7.29530/27.1407; U; en) Presto/2.8.119 Version/11.10' + 'Opera/9.80 (Android; Opera Mini/7.29530/27.1407; U; en) Presto/2.8.119 Version/11.10', + // Ovi Browser + 'Mozilla/5.0 (Series40; NokiaX3-02/05.60; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.2.0.0.6', + 'Mozilla/5.0 (Series40; Nokia305/05.92; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.7.0.0.11' ], // No explicit support for or against these browsers, they're // given a shot at Grade A at their own risk.