Index: openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl	11 Sep 2024 06:15:48 -0000	1.23
+++ openacs-4/packages/acs-tcl/tcl/html-email-procs.tcl	25 Nov 2024 13:20:00 -0000	1.24
@@ -81,7 +81,7 @@
     # the first three lines of the message are special; we need to grab
     # the info, add it to the message headers, and discard the lines
     set lines [split $mime_body \n]
-    set message_data [ns_set new]
+    set message_data [ns_set create]
 
     # get mime version
     regexp {MIME-Version: (.*)} [lindex $lines 0] junk mime_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.197 -r1.198
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	7 Nov 2024 11:54:02 -0000	1.197
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	25 Nov 2024 13:20:00 -0000	1.198
@@ -259,7 +259,7 @@
 
     @return new ns_set
 } {
-    set new_set_id [ns_set new "no_nulls$old_set_id"]
+    set new_set_id [ns_set create "no_nulls$old_set_id"]
 
     foreach {key value} [ns_set array $old_set_id] {
         if { $value ne "" } {
@@ -1351,23 +1351,8 @@
         append content_type "; charset=[ns_config ns/parameters OutputCharset utf-8]"
     }
 
-    if {[ns_info name] eq "NaviServer"} {
-        set binary [expr {$text_p ? "" : "-binary"}]
-        ns_headers {*}$binary 200 $content_type {*}$content_length
-    } else {
-        if {$content_length ne ""} {
-            ns_set put [ns_conn outputheaders] "Content-Length" $content_length
-        }
-        set all_the_headers "HTTP/1.0 200 OK
-MIME-Version: 1.0
-Content-Type: $content_type\r\n"
-        util_WriteWithExtraOutputHeaders $all_the_headers
-        if {[string match "text/*" $content_type]} {
-            ns_startcontent -type $content_type
-        } else {
-            ns_startcontent
-        }
-    }
+    set binary [expr {$text_p ? "" : "-binary"}]
+    ns_headers {*}$binary 200 $content_type {*}$content_length
 }
 
 ad_proc -public ad_return_top_of_page {