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.82.2.2 -r1.82.2.3
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	7 Sep 2005 16:46:58 -0000	1.82.2.2
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	28 Dec 2005 23:29:11 -0000	1.82.2.3
@@ -1474,3 +1474,20 @@
 
     return filter_return
 }
+
+
+if {[ns_info name] eq "NaviServer"} {
+  foreach filter {rp_filter rp_resources_filter request_denied_filter} {
+    rename $filter ${filter}_aolserver
+    proc $filter {_ why} [list ${filter}_aolserver \$why]
+  }
+
+  rename rp_invoke_filter rp_invoke_filter_conn
+  proc   rp_invoke_filter { filter_info why } { rp_invoke_filter_conn {} $filter_info $why }
+  
+  rename rp_invoke_proc   rp_invoke_proc_conn
+  proc   rp_invoke_proc   { argv }            { rp_invoke_proc_conn {} $argv }
+
+  rename rp_handler rp_handler_aolserver
+  proc rp_handler {_} {rp_handler_aolserver}
+}
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.83.2.4 -r1.83.2.5
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	27 Dec 2005 08:55:19 -0000	1.83.2.4
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	28 Dec 2005 23:29:11 -0000	1.83.2.5
@@ -353,7 +353,7 @@
 }
 
 proc_doc util_PrettyTclBoolean {zero_or_one} "Turns a 1 (or anything else that makes a Tcl IF happy) into Yes; anything else into No" {
-    if $zero_or_one {
+  if {$zero_or_one} {
 	return "Yes"
     } else {
 	return "No"
@@ -1948,6 +1948,10 @@
 ad_proc -private ad_run_scheduled_proc { proc_info } { 
     Runs a scheduled procedure and updates monitoring information in the shared variables. 
 } {
+    if {[ns_info name] eq "NaviServer"} {
+      set proc_info [lindex $proc_info 0]
+    }
+
     # Grab information about the scheduled procedure.
     set thread [lindex $proc_info 0]
     set once [lindex $proc_info 1]