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 -r1.7 -r1.8 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 20 Nov 2001 21:49:52 -0000 1.7 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 11 Feb 2002 13:51:11 -0000 1.8 @@ -654,7 +654,7 @@ ad_try { ad_conn -set path_info \ [string range $path [expr [string length $prefix] - 1] end] - rp_serve_abstract_file -noredirect \ + rp_serve_abstract_file -noredirect -nodirectory \ -extension_pattern ".vuh" "$root$prefix" set tcl_url2file([ad_conn url]) [ad_conn file] set tcl_url2path_info([ad_conn url]) [ad_conn path_info] @@ -673,16 +673,6 @@ } } - if {[info exists dir_index]} { - set listings [ns_config "ns/server/[ns_info server]" \ - "directorylisting" "none"] - if { [nsv_get rp_directory_listing_p .] } { - ns_returnnotice 200 "Directory listing of $dir_index" \ - [rp_html_directory_listing $dir_index] - return - } - } - ad_call_proc_if_exists ds_add rp [list transformation [list notfound $root/$path notfound] $startclicks [clock clicks]] ns_returnnotfound } errmsg]] { @@ -700,6 +690,7 @@ ad_proc -private rp_serve_abstract_file { -noredirect:boolean + -nodirectory:boolean {-extension_pattern ".*"} path } { @@ -759,7 +750,7 @@ ad_raise redirect $url } else { - if { [info exists dir_index] } { + if { [info exists dir_index] && !$nodirectory_p } { ad_raise directory $dir_index } else { # Nothing at all found! 404 time.