Index: openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl,v diff -u -N -r1.6.4.1 -r1.6.4.2 --- openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl 22 May 2014 21:16:09 -0000 1.6.4.1 +++ openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl 3 Aug 2014 19:40:18 -0000 1.6.4.2 @@ -10,18 +10,17 @@ } set tcl_docs_root "http://tcl.tk/man/tcl[info tclversion]/TclCmd/" - set tcl_docs_url "${tcl_docs_root}contents.htm" with_catch errmsg { - set tcl_docs_index_page [util_memoize [list ns_httpget $tcl_docs_url]] + set tcl_docs_index_result [util_memoize [list util::http::get -url $tcl_docs_url]] + set tcl_docs_index_page [dict get $tcl_docs_index_result page] } { ad_return_error "Cannot Connect" "We're sorry, but we're having problems connecting to the server containing the Tcl documentation: $tcl_docs_url" ad_script_abort } set tcl_proc [lindex $tcl_proc 0] - set len [string length $tcl_proc] for { set i [expr { $len-1 }] } { $i >= 0 } { incr i -1 } { Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v diff -u -N -r1.51.8.5 -r1.51.8.6 --- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 2 Oct 2013 09:10:21 -0000 1.51.8.5 +++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 3 Aug 2014 19:50:11 -0000 1.51.8.6 @@ -894,9 +894,10 @@ set marker "XXYYZZXX. " set qmsg "$marker $msg" set url "http://babel.altavista.com/translate.dyn?doit=done&BabelFishFrontPage=yes&bblType=urltext&url=" - set babel_result [ns_httpget "$url&lp=$lang&urltext=[ns_urlencode $qmsg]"] + set babel_result [util::http::get -url "$url&lp=$lang&urltext=[ns_urlencode $qmsg]"] + set babel_page [dict get $babel_result page] set result_pattern "$marker (\[^<\]*)" - if {[regexp -nocase $result_pattern $babel_result ignore msg_tr]} { + if {[regexp -nocase $result_pattern $babel_page ignore msg_tr]} { regsub "$marker." $msg_tr "" msg_tr return [string trim $msg_tr] } else { Index: openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl,v diff -u -N -r1.8.8.1 -r1.8.8.2 --- openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl 2 Oct 2013 22:55:56 -0000 1.8.8.1 +++ openacs-4/packages/acs-tcl/tcl/server-cluster-procs.tcl 3 Aug 2014 19:50:10 -0000 1.8.8.2 @@ -54,12 +54,13 @@ proc server_cluster_do_httpget { url timeout } { if { [catch { - set page [ns_httpget $url $timeout 0] + set result [util::http::get -url $url -timeout $timeout -max_depth 0] + set page [dict get $result page] if { ![regexp -nocase successful $page] } { - ns_log "Error" "Clustering: ns_httpget $url returned unexpected value. Is /SYSTEM/flush-memoized-statement.tcl set up on this host?" + ns_log "Error" "Clustering: util::http::get $url returned unexpected value. Is /SYSTEM/flush-memoized-statement.tcl set up on this host?" } } error] } { - ns_log "Error" "Clustering: Unable to ns_httpget $url (with timeout $timeout): $error" + ns_log "Error" "Clustering: Unable to get $url (with timeout $timeout): $error" } }