Download as
Browse Code »

Commit c3f4edc38cfeb750c259a814d35f1360c4836765

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 0a37bbec
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem969: crash when viewing RSS feed under SSL(HTTPS)

Showing 2 changed files with 12 additions and 0 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @c3f4edc
... ... @@ -67,6 +67,7 @@ class ApplicationController < ActionController::Base
67 67 def avoid_ssl
68 68 return true if (!request.ssl? || ENV['RAILS_ENV'] == 'development')
69 69 redirect_to(params.merge(:protocol => 'http://'))
  70 + false
70 71 end
71 72  
72 73 before_init_gettext :maybe_save_locale
... ...
test/functional/application_controller_test.rb
  Diff comments   View file @c3f4edc
... ... @@ -412,4 +412,15 @@ class ApplicationControllerTest < Test::Unit::TestCase
412 412 assert_no_tag :tag => 'div', :attributes => {:id => 'block-' + b.id.to_s}
413 413 end
414 414  
  415 + should 'return false when not avoid ssl' do
  416 + req = mock
  417 + req.stubs(:ssl?).returns(true)
  418 +
  419 + @controller.expects(:request).returns(req)
  420 + @controller.stubs(:params).returns({})
  421 + @controller.stubs(:redirect_to)
  422 +
  423 + assert_equal false, @controller.avoid_ssl
  424 + end
  425 +
415 426 end
... ...