commit 31715a422e9509d76aa0a70f0478087def1f6269 Author: David Fifield david@bamsoftware.com Date: Sun Oct 16 17:15:38 2011 -0700
Remove self-disabling based on User-Agent.
This doesn't work across domains. (It causes a Flash exception that disables the proxy for everyone.) It's going to be replaced with a bit of JavaScript in the page itself that does the same check. --- swfcat.as | 44 -------------------------------------------- 1 files changed, 0 insertions(+), 44 deletions(-)
diff --git a/swfcat.as b/swfcat.as index fe29bbb..3489bf2 100644 --- a/swfcat.as +++ b/swfcat.as @@ -135,56 +135,12 @@ package return default_addr; }
- /* Are circumstances such that we should self-disable and not be a - proxy? We take a best-effort guess as to whether this device runs on - a battery or the data transfer might be expensive. - - Matching mobile User-Agents is complex; but we only need to match - those devices that can also run a recent version of Adobe Flash, - which is a subset of this list: - https://secure.wikimedia.org/wikipedia/en/wiki/Adobe_Flash_Player#Mobile_ope... - - Other resources: - http://www.zytrax.com/tech/web/mobile_ids.html - http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect-... - http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.p... - */ - private function should_disable():Boolean - { - var ua:String; - - ua = ExternalInterface.call("window.navigator.userAgent.toString"); - if (ua != null) { - const UA_LIST:Array = [ - /\bmobile\b/i, - /\bandroid\b/i, - /\bopera mobi\b/i, - ]; - - for (var i:uint = 0; i < UA_LIST.length; i++) { - var re:RegExp = UA_LIST[i]; - - if (ua.match(re)) { - puts("Disabling because User-Agent matched " + re + "."); - return true; - } - } - } - - return false; - } - /* The main logic begins here, after start-up issues are taken care of. */ private function proxy_main():void { var fac_url:String; var loader:URLLoader;
- if (should_disable()) { - puts("Disabling self."); - return; - } - if (proxy_pairs.length >= MAX_NUM_PROXY_PAIRS) { setTimeout(proxy_main, FACILITATOR_POLL_INTERVAL); return;