Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.54 -r1.55
--- openacs-4/packages/acs-tcl/acs-tcl.info	6 Jul 2008 15:46:16 -0000	1.54
+++ openacs-4/packages/acs-tcl/acs-tcl.info	30 Aug 2008 11:19:11 -0000	1.55
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.5.0d1" url="http://openacs.org/repository/download/apm/acs-tcl-5.5.0d1.apm">
+    <version name="5.5.0d2" url="http://openacs.org/repository/download/apm/acs-tcl-5.5.0d2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>The Kernel Tcl API library.</summary>
         <release-date>2008-05-31</release-date>
@@ -18,16 +18,17 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-tcl" version="5.5.0d1"/>
-        <requires url="acs-bootstrap-installer" version="5.5.0d1"/>
-        <requires url="acs-kernel" version="5.5.0d1"/>
+        <provides url="acs-tcl" version="5.5.0d2"/>
+        <requires url="acs-bootstrap-installer" version="5.5.0d2"/>
+        <requires url="acs-kernel" version="5.5.0d2"/>
 
         <callbacks>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="HtmlDocBin"  default="/usr/bin/htmldoc" description="path to the executable of htmldoc"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ReturnComplaint"  default="/packages/acs-tcl/lib/ad-return-complaint" description="Template to use for the complaint page."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ReturnError"  default="/packages/acs-tcl/lib/ad-return-error" description="Template to use for the complaint page."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SuppressHttpPort"  default="0" description="Set to 1 to suppress the server's configured port --useful for example, when server is behind a proxy and: connection is switching from https to http or kernel's parameter ForceHostP is set to 1."/>
         </parameters>
 
     </version>
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -r1.109 -r1.110
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	7 Jun 2008 20:28:58 -0000	1.109
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	30 Aug 2008 11:19:11 -0000	1.110
@@ -2370,7 +2370,15 @@
     set Hostv [split $Host ":"]
     set Host_hostname [lindex $Hostv 0]
     set Host_port [lindex $Hostv 1]
-    
+
+    # suppress the configured http port when server is behind a proxy, to keep connection behind proxy
+    set suppress_port [parameter::get -package_id [ad_acs_kernel_id] -parameter SuppressHttpPort -default 0]
+    if { $suppress_port && [string equal $port [ns_config -int "ns/server/[ns_info server]/module/nssock" Port]] } {
+        ns_log Debug "util_current_location: suppressing http port $Host_port"
+        set Host_port ""
+        set port ""
+    }
+
     # Server config location
     if { ![regexp {^([a-z]+://)?([^:]+)(:[0-9]*)?$} [ad_conn location] match location_proto location_hostname location_port] } {
         ns_log Error "util_current_location couldn't regexp '[ad_conn location]'"