[tor-commits] [meek/master] Allow http URLs in the Firefox helper.

[dcf at torproject.org]

commit 7b1b77baa8502fca3f0231a8c8a08aea408c2f21
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Sep 24 18:05:04 2014 -0700

    Allow http URLs in the Firefox helper.
    
    I keep trying them and being surprised when they don't work. It causes
    me to disable the helper and run using just meek-client instead. The
    restriction against http URLs was intended as a failsafe, to prevent
    people from accidentally configuring an http URL when they meant to do
    https. But I think its value as a diagnostic outweighs that
    consideration.
---
 firefox/components/main.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firefox/components/main.js b/firefox/components/main.js
index 1b71412..c9f1058 100644
--- a/firefox/components/main.js
+++ b/firefox/components/main.js
@@ -273,7 +273,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = {
             dump("req.method is " + JSON.stringify(req.method) + ", not \"POST\".\n");
             return false;
         }
-        if (!req.url.startsWith("https://")) {
+        if (!(req.url.startsWith("http://") || req.url.startsWith("https://"))) {
             dump("req.url doesn't start with \"https://\".\n");
             return false;
         }