Index: openacs-4/packages/acs-tcl/tcl/admin-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/admin-procs.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	26 Jan 2004 15:39:46 -0000	1.15
+++ openacs-4/packages/acs-tcl/tcl/admin-procs.tcl	12 Jul 2004 21:02:29 -0000	1.15.2.1
@@ -25,7 +25,7 @@
     if { [security::secure_conn_p] } {
         return "filter_ok"
     }
-    
+
     ad_returnredirect [security::get_secure_qualified_url [ad_return_url]]
     # No abort since in filter
     
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.32.2.1 -r1.32.2.2
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	2 Jun 2004 16:26:51 -0000	1.32.2.1
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	12 Jul 2004 21:02:30 -0000	1.32.2.2
@@ -1503,6 +1503,9 @@
         # Prefix with https
         regsub {^(?:http://)?} $secure_location {https://} secure_location
 
+	# remove port number if using nonstandard port
+        regexp {^(.*):(.*)?} $secure_location match secure_location port
+
         # Add port number if non-standard
         set https_port [get_https_port]
         if { ![string equal $https_port 443] } {