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.34 -r1.35
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	24 Jul 2004 08:34:07 -0000	1.34
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	13 Jan 2005 13:55:56 -0000	1.35
@@ -1400,7 +1400,7 @@
 
     @author Peter Marklund
 } {
-    set_insecure_url [get_insecure_qualified_url $url]
+    set insecure_url [get_insecure_qualified_url $url]
     
     ad_returnredirect $insecure_url
     ad_script_abort
@@ -1504,13 +1504,14 @@
         regsub {^(?:http://)?} $secure_location {https://} secure_location
 
 	# remove port number if using nonstandard port
-        regexp {^(.*):(.*)?} $secure_location match secure_location port
+        regexp {^(.*:.*):([0-9]+)} $secure_location match secure_location port
 
         # Add port number if non-standard
         set https_port [get_https_port]
         if { ![string equal $https_port 443] } {
             set secure_location ${secure_location}:$https_port
         }
+
     }
 
     return $secure_location
@@ -1530,6 +1531,7 @@
     } else {
         # Current location is secure - use location from config file
         set insecure_location [ad_conn location]
+        regsub -all {https://} $insecure_location "" insecure_location
         if { ![regexp $http_prefix $insecure_location] } {
             # Prepend http://
             set insecure_location ${http_prefix}${insecure_location}