Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 7 Jul 2002 11:18:37 -0000 1.5 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 8 Jul 2002 09:38:18 -0000 1.6 @@ -165,18 +165,19 @@ } proc_doc ds_collect_connection_info {} { Collects information about the current connection. Should be called only at the very beginning of the request processor handler. } { - if { [ds_enabled_p] && [ds_collection_enabled_p] } { + # JCD: check recursion_count to ensure adding headers only one time. + if { [ds_enabled_p] && [ds_collection_enabled_p] && ![ad_conn recursion_count]} { ##This is expensive, but easy. Otherwise we need to do it in every interpreter ds_replace_get_user_procs [ds_user_switching_enabled_p] - ds_add start [ns_time] - ds_add conn startclicks [clock clicks] - for { set i 0 } { $i < [ns_set size [ad_conn headers]] } { incr i } { - ds_add headers [ns_set key [ad_conn headers] $i] [ns_set value [ad_conn headers] $i] - } - foreach param { method url query request peeraddr } { - ds_add conn $param [ad_conn $param] - } + ds_add start [ns_time] + ds_add conn startclicks [clock clicks] + for { set i 0 } { $i < [ns_set size [ad_conn headers]] } { incr i } { + ds_add headers [ns_set key [ad_conn headers] $i] [ns_set value [ad_conn headers] $i] + } + foreach param { method url query request peeraddr } { + ds_add conn $param [ad_conn $param] + } } } Index: openacs-4/packages/acs-developer-support/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/index.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-developer-support/www/index.tcl 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/acs-developer-support/www/index.tcl 8 Jul 2002 09:38:18 -0000 1.2 @@ -102,7 +102,7 @@ array set conn [nsv_get ds_request $request] if { [catch { - set start [ns_fmttime [nsv_get ds_request "$id.start"] "%T"] + set start [ns_fmttime [lindex [nsv_get ds_request "$id.start"] 0] "%T"] }] } { set start "?" } @@ -133,6 +133,7 @@ } } else { set conn(url) "" + set url {} } if { [info exists conn(query)] && ![empty_string_p $conn(query)] } { @@ -150,7 +151,7 @@  $start   $duration   $peeraddr  -[ns_quotehtml "$method $query"] +[ns_quotehtml "$method $url$query"] " incr counter