[tor-commits] [meek/master] Use HTTPS for example forwarding URLs.

[dcf at torproject.org]

commit 41ccd908d8850d5a50204a302a5b030e65b18469
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Feb 22 12:25:28 2015 -0800

    Use HTTPS for example forwarding URLs.
    
    All our deployed backends are using HTTPS in forwarding. Might as well
    make it the default for DIY deployers. I seem to remember that we once
    had trouble on some platform (maybe some PHP host) because the installed
    PHP library didn't have SSL support, but whatever.
---
 appengine/reflect.go     |    4 ++--
 meek-server/README       |    2 +-
 nginx/nginx.conf.example |    2 +-
 php/index.php            |    2 +-
 wsgi/reflect.py          |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/appengine/reflect.go b/appengine/reflect.go
index a5ac291..44596b9 100644
--- a/appengine/reflect.go
+++ b/appengine/reflect.go
@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	forwardURL = "http://meek.bamsoftware.com:7002/"
+	forwardURL = "https://meek.bamsoftware.com/"
 	// A timeout of 0 means to use the App Engine default (5 seconds).
 	urlFetchTimeout = 20 * time.Second
 )
@@ -48,7 +48,7 @@ func copyRequest(r *http.Request) (*http.Request, error) {
 		return nil, err
 	}
 	// Append the requested path to the path in forwardURL, so that
-	// forwardURL can be something like "http://example.com/reflect".
+	// forwardURL can be something like "https://example.com/reflect".
 	u.Path = pathJoin(u.Path, r.URL.Path)
 	c, err := http.NewRequest(r.Method, u.String(), r.Body)
 	if err != nil {
diff --git a/meek-server/README b/meek-server/README
index 84ea4fb..40bc3fe 100644
--- a/meek-server/README
+++ b/meek-server/README
@@ -11,7 +11,7 @@
 
 - To test your bridge on the clinet side, you can add a line like this to your torrc:
 
-	Bridge meek 0.0.2.0:1 url=http://my-bridge.example.com:7002/
+	Bridge meek 0.0.2.0:1 url=https://my-bridge.example.com:7443/
 
 # Important Note:
 
diff --git a/nginx/nginx.conf.example b/nginx/nginx.conf.example
index 4ed239c..b125011 100644
--- a/nginx/nginx.conf.example
+++ b/nginx/nginx.conf.example
@@ -44,7 +44,7 @@ server {
 	location / {
 		# Proxy all traffic received with the meek Host to
 		# a meek-server instance.
-		proxy_pass http://meek.bamsoftware.com:7002;
+		proxy_pass https://meek.bamsoftware.com/;
 
 		# Disable logging for the reflector.
 		access_log off;
diff --git a/php/index.php b/php/index.php
index 44fb0e1..5ee1b86 100644
--- a/php/index.php
+++ b/php/index.php
@@ -1,7 +1,7 @@
 <?php
 	// A PHP reflector for meek.
 
-	$forwardURL = "http://meek.bamsoftware.com:7002/";
+	$forwardURL = "https://meek.bamsoftware.com/";
 
 	$headerArray = array();
 	if (array_key_exists("HTTP_X_SESSION_ID", $_SERVER)) {
diff --git a/wsgi/reflect.py b/wsgi/reflect.py
index 3836254..4a522b4 100644
--- a/wsgi/reflect.py
+++ b/wsgi/reflect.py
@@ -3,7 +3,7 @@
 import httplib
 import urlparse
 
-FORWARD_URL = "http://meek.bamsoftware.com:7002/"
+FORWARD_URL = "https://meek.bamsoftware.com/"
 TIMEOUT = 20
 BUFSIZ = 2048