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 -N -r1.74.2.12 -r1.74.2.13
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	29 Jul 2014 22:54:28 -0000	1.74.2.12
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	30 Jul 2014 09:24:04 -0000	1.74.2.13
@@ -514,8 +514,8 @@
             set max_age inf
 	}
     }
-    ad_set_signed_cookie -secure t -discard $discard -replace t -max_age $max_age -domain $domain \
-	    "ad_session_id" "$session_id,$user_id,$login_level,[ns_time]"
+    ad_set_signed_cookie -secure [security::secure_conn_p] -discard $discard -replace t -max_age $max_age -domain $domain \
+	    ad_session_id "$session_id,$user_id,$login_level,[ns_time]"
 }
 
 ad_proc -private sec_generate_secure_token_cookie { } { 
@@ -1464,7 +1464,7 @@
 #####
 
 ad_proc -public security::https_available_p {} {
-    Return 1 if AOLserver is configured to support HTTPS and 0 otherwise.
+    Return 1 if server is configured to support HTTPS and 0 otherwise.
 
     @author Peter Marklund
 } {