diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 771e99c1df1554eabf2f0e137acbaf7918f15606..ae7abe5e043d95c929ead9375ad292c8c35e32be 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed https handling on other ports than 443 [Alan Gano]
+
 * Added follow_redirect method for functional tests that'll get-request the redirect that was made. Example:
 
     def test_create_post
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index 907cebc250ebf0cf87b1f3acf775e1097834eedd..0fe96479f4cfdad9cc15d2c80cad9fe54148cc65 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -117,7 +117,7 @@ def template_path_for_local_rescue(exception)
             when RoutingError then "routing_error"
             when UnknownAction   then "unknown_action"
             when ActionView::TemplateError then "template_error"
-            else raise ;"diagnostics"
+            else "diagnostics"
           end
         )
       end