Index: openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl,v diff -u -r1.45.2.5 -r1.45.2.6 --- openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 13 Jan 2021 12:39:47 -0000 1.45.2.5 +++ openacs-4/packages/acs-tcl/tcl/apm-file-procs.tcl 13 Jan 2021 13:10:29 -0000 1.45.2.6 @@ -453,32 +453,11 @@ # 5 minutes set timeout 300 - set httpImpls [util::http::available -url $url -spool] + set httpImpls [util::http::available] if {$httpImpls ne ""} { ns_log notice "we can use the http::util:: interface using the $httpImpls implementation" set result [util::http::get -url $url -timeout $timeout -spool] file rename [dict get $result file] $output_file_name - } elseif { - [namespace which ::ns_http] ne "" - && [apm_version_names_compare \ - [regsub -nocase {rc[[:digit:]]*$} [ns_info patchlevel] {}] \ - "4.99.5"] == 1 - } { - # - # ... use ns_http when we have a version with the "-file" flag ... - # - foreach i {1 2 3} { - ns_log notice "Transfer $url to $output_file_name based on ns_http" - set h [ns_http queue -timeout $timeout:0 $url] - set replyHeaders [ns_set create] - ns_http wait -file F -headers $replyHeaders -spoolsize 1 $h - if {[ad_file exists $output_file_name]} {file delete -- $output_file_name} - file rename -- $F $output_file_name - set location [ns_set iget $replyHeaders location] - if {$location eq ""} break - ns_log notice "Transfer $url redirected to $location ..." - set url $location - } } elseif {[namespace which ::xo::HttpRequest] ne ""} { # # ... use xo::HttpRequest... Index: openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl,v diff -u -r1.30.2.14 -r1.30.2.15 --- openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl 13 Jan 2021 12:39:47 -0000 1.30.2.14 +++ openacs-4/packages/acs-tcl/tcl/http-client-procs.tcl 13 Jan 2021 13:10:29 -0000 1.30.2.15 @@ -188,8 +188,7 @@ return $headers } -ad_proc -private util::http::available { - -url +ad_proc -public util::http::available { {-preference {native curl}} } {