From: Tom Hughes <tom@compton.nu>
Date: Fri, 9 Feb 2018 22:31:45 +0000 (+0000)
Subject: Use https when redirecting to the render server
X-Git-Tag: live~3133
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/96cc9abd239340a5fb93c7fb3b47415c09914047

Use https when redirecting to the render server
---

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 1b7beaad6..afdf4d8d7 100644
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -19,7 +19,7 @@ class ExportController < ApplicationController
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
-      redirect_to "http://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
+      redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
     end
   end
 
diff --git a/test/controllers/export_controller_test.rb b/test/controllers/export_controller_test.rb
index 972e08cc3..94cf6cf52 100644
--- a/test/controllers/export_controller_test.rb
+++ b/test/controllers/export_controller_test.rb
@@ -27,7 +27,7 @@ class ExportControllerTest < ActionController::TestCase
   def test_finish_mapnik
     get :finish, :params => { :minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => "mapnik", :mapnik_format => "test", :mapnik_scale => "12" }
     assert_response :redirect
-    assert_redirected_to "http://render.openstreetmap.org/cgi-bin/export?bbox=0.0,50.0,1.0,51.0&scale=12&format=test"
+    assert_redirected_to "https://render.openstreetmap.org/cgi-bin/export?bbox=0.0,50.0,1.0,51.0&scale=12&format=test"
   end
 
   ##