Index: openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl,v
diff -u -r1.1.2.13 -r1.1.2.14
--- openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl	6 Aug 2020 13:09:52 -0000	1.1.2.13
+++ openacs-4/packages/acs-tcl/tcl/00-icanuse-procs.tcl	21 Sep 2020 11:28:56 -0000	1.1.2.14
@@ -85,11 +85,12 @@
 # loading order.
 #
 
-::acs::register_icanuse "ns_db currenthandles" [acs::cmd_has_subcommand ns_db currenthandles]
-::acs::register_icanuse "ns_server unmap" [acs::cmd_has_subcommand ns_server unmap]
-::acs::register_icanuse "ns_set keys" [acs::cmd_has_subcommand ns_set keys]
+::acs::register_icanuse "ns_db currenthandles"      [acs::cmd_has_subcommand ns_db currenthandles]
+::acs::register_icanuse "ns_server unmap"           [acs::cmd_has_subcommand ns_server unmap]
+::acs::register_icanuse "ns_set keys"               [acs::cmd_has_subcommand ns_set keys]
+::acs::register_icanuse "ns_setcookie -samesite"    [acs::cmd_error_contains ns_setcookie -samesite]
 
-::acs::register_icanuse "ns_conn partialtimes" [acs::cmd_has_subcommand ns_conn partialtimes]
+::acs::register_icanuse "ns_conn partialtimes"      [acs::cmd_has_subcommand ns_conn partialtimes]
 ::acs::register_icanuse "ns_conn contentsentlength" [acs::cmd_has_subcommand ns_conn contentsentlength]
 ::acs::register_icanuse "nsv_dict"                  [acs::cmd_error_contains {nsv_dict get ""} -varname]
 
Index: openacs-4/packages/acs-tcl/tcl/utilities-procs-naviserver.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs-naviserver.tcl,v
diff -u -r1.4.2.6 -r1.4.2.7
--- openacs-4/packages/acs-tcl/tcl/utilities-procs-naviserver.tcl	31 Oct 2019 18:12:06 -0000	1.4.2.6
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs-naviserver.tcl	21 Sep 2020 11:28:56 -0000	1.4.2.7
@@ -13,22 +13,15 @@
     return
 }
 
-#
-# If the server supports samesite cookie, set the samesite as provided.
-#
-try { ns_setcookie } on error {r} {
-    set ::acs::serverSupports(samesiteCookie) [string match "*-samesite*" $r]
-}
-
-
 #-------------------------------------------------------------------------
 # NaviServer implementation of ad_url(en|de)code* procs
 #-------------------------------------------------------------------------
 
 ad_proc -public ad_urlencode_folder_path { folder_path } {
+
     Perform an urlencode operation on the segments of the provided
-    folder path, i.e. for a full folder path rather than path segments as in
-    ad_urlencode_path.
+    folder path, i.e. for a full folder path rather than path segments
+    as in ad_urlencode_path.
 
     @see ad_urlencode_path
 } {
@@ -160,7 +153,7 @@
 
     @see ad_get_cookie
     @see ad_unset_cookie
-    @see ad_set_signed_cookie    
+    @see ad_set_signed_cookie
 } {
 
 
@@ -174,7 +167,7 @@
         }
     }
 
-    if {$samesite ne "none" && $::acs::serverSupports(samesiteCookie)} {
+    if {$samesite ne "none" && [::acs::icanuse "ns_setcookie -samesite"]} {
         set samesiteFlag "-samesite $samesite"
     } else {
         set samesiteFlag ""