[tor-commits] [flashproxy/js] Don't disable for Chrome.

[dcf at torproject.org]

commit 69bbe1f1f97866edbe6552569becbebec4ea1efa
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Apr 7 04:19:00 2012 -0700

    Don't disable for Chrome.
    
    The Chrome/Chromium user-agent includes "Safari"; do an extra check.
---
 flashproxy.js |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/flashproxy.js b/flashproxy.js
index 005e51d..df049c1 100644
--- a/flashproxy.js
+++ b/flashproxy.js
@@ -749,9 +749,6 @@ function flashproxy_should_disable() {
             /\bmobile\b/i,
             /\bandroid\b/i,
             /\bopera mobi\b/i,
-            /* Disable on Safari because it doesn't have the hybi/RFC type of
-               WebSockets. */
-            /\bsafari\b/i,
         ];
 
         for (var i = 0; i < UA_LIST.length; i++) {
@@ -763,6 +760,11 @@ function flashproxy_should_disable() {
         }
     }
 
+    if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i))
+        /* Disable on Safari because it doesn't have the hybi/RFC type of
+           WebSockets. */
+        return true;
+
     if (!WebSocket)
         /* No WebSocket support. */
         return true;