Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v
diff -u -N -r1.41 -r1.42
--- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl	8 Dec 2012 18:20:36 -0000	1.41
+++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl	29 Mar 2013 14:05:28 -0000	1.42
@@ -345,8 +345,7 @@
         # db_qd_log QDDebug "calling namespace = $calling_namespace"
 
         if {$calling_namespace ne "" && 
-            ![regexp {::} $proc_name all]} {
-
+            ![string match *::* $proc_name]} {
             set proc_name ${calling_namespace}::${proc_name}
         }
 	# db_qd_log QDDebug "proc_name is -$proc_name-"
@@ -387,20 +386,18 @@
 
     # db_qd_log QDDebug "generated fullname of $full_name"
     
+    # The following block is apparently just for debugging
     # aks - making debug output actually useable
-    if {[llength $proc_name] > 1} {
-        
-        set proc_name_with_parameters "[lindex $proc_name 0] "
-        
-        set i 1
-        foreach parameter [lrange $proc_name  1 end] {
-            append proc_name_with_parameters "parameter$i: $parameter " 
-            incr i
-        }
-    } else {
-        set proc_name_with_parameters $proc_name
-    }
-
+    # if {[llength $proc_name] > 1} {
+    #     set proc_name_with_parameters "[lindex $proc_name 0] "
+    #     set i 1
+    #     foreach parameter [lrange $proc_name  1 end] {
+    #         append proc_name_with_parameters "parameter$i: $parameter " 
+    #         incr i
+    #     }
+    # } else {
+    #     set proc_name_with_parameters $proc_name
+    # }
     # db_qd_log QDDebug "db_qd_get_fullname: following query in file: $url proc: $proc_name_with_parameters"
 
     return $full_name
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.109 -r1.110
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	20 Feb 2013 13:34:53 -0000	1.109
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	29 Mar 2013 14:05:28 -0000	1.110
@@ -1444,8 +1444,7 @@
         return
     }
 
-    global ad_conn
-    if { [info exists ad_conn(no_http_cache_control_p)] && $ad_conn(no_http_cache_control_p) } {
+    if { [info exists ::ad_conn(no_http_cache_control_p)] && $::ad_conn(no_http_cache_control_p) } {
         return
     }
 
@@ -1455,13 +1454,13 @@
     # don't touch anything. 
     set modify_p 1
 
-    if { ([ns_set ifind $headers  "cache-control"] > -1 ||
-         [ns_set ifind $headers  "expires"] > -1) } {
+    if { [ns_set ifind $headers "cache-control"] > -1 ||
+         [ns_set ifind $headers "expires"] > -1 } {
         set modify_p 0
     } else {
         for { set i 0 } { $i < [ns_set size $headers] } { incr i } {
-            if { [string tolower [ns_set key $headers $i]] == "pragma" &&
-                 [string tolower [ns_set value $headers $i]] == "no-cache" } {
+            if { [string tolower [ns_set key $headers $i]] eq "pragma" &&
+                 [string tolower [ns_set value $headers $i]] eq "no-cache" } {
                 set modify_p 0
                 break
             }
@@ -1525,7 +1524,7 @@
 
     if {$node_id eq ""} {
         set host [regsub "www\." $host ""]
-        set node_id [rp_lookup_node_from_host $host]
+	set node_id [util_memoize [list rp_lookup_node_from_host $host]]
     }
 
     if { $node_id ne "" } {