Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -N -r1.153.2.13 -r1.153.2.14 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 16 Nov 2019 15:56:59 -0000 1.153.2.13 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 29 Nov 2019 15:30:15 -0000 1.153.2.14 @@ -567,9 +567,9 @@ # ------------------------------------------------------------------------- # 1. determine the root of the host and the requested URL ad_try { - set root [root_of_host [ad_host]] + set root [acs::root_of_host [ad_host]] } on error {errorMsg} { - ad_log warning "rp_filter: root_of_host returned error: $errorMsg" + ad_log warning "rp_filter: acs::root_of_host returned error: $errorMsg" ad_page_contract_handle_datasource_error "Host header is invalid" return filter_return } @@ -1848,21 +1848,33 @@ namespace eval ::acs {} -ad_proc root_of_host {host} { +ad_proc -deprecated root_of_host {host} { Maps a hostname to the corresponding sub-directory. + DEPRECATED: this proc does not comply with OpenACS naming + convention. + + @see acs::root_of_host + } { + return [acs::root_of_host $host] +} + +ad_proc acs::root_of_host {host} { + + Maps a hostname to the corresponding sub-directory. + +} { set key ::acs::root_of_host($host) if {[info exists $key]} {return [set $key]} set $key [acs::root_of_host_noncached $host] } - ad_proc -private acs::root_of_host_noncached {host} { - Helper function for root_of_host, which performs the actual work. + Helper function for acs::root_of_host, which performs the actual work. } { #