Index: openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl,v
diff -u -N -r1.59 -r1.60
--- openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	14 May 2007 20:30:26 -0000	1.59
+++ openacs-4/packages/acs-tcl/tcl/form-processing-procs.tcl	12 Oct 2007 07:21:49 -0000	1.60
@@ -611,6 +611,7 @@
                 lappend af_element_names($form_name) "[concat "-section" [uplevel [list subst [lrange $element 1 end]]]]"
             } else {
                 set element_name_part [uplevel [list subst $element_name_part]]
+ns_log notice "element_name_part=$element_name_part"
                 if { ![regexp {^([^ \t:]+)(?::([a-zA-Z0-9_,(|)]*))?$} $element_name_part match element_name flags] } {
                     return -code error "Form element '$element_name_part' doesn't have the right format. It must be var\[:flag\[,flag ...\]\]"
                 }
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.89 -r1.90
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	14 Aug 2007 14:09:01 -0000	1.89
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	12 Oct 2007 07:21:49 -0000	1.90
@@ -488,6 +488,7 @@
         set path "[acs_root_dir]/www/resources/[join [lrange [ns_conn urlv] 1 end] /]"
     }
     if { [file isfile $path] } {
+        ns_setexpires 300
         ns_returnfile 200 [ns_guesstype $path] $path
         return filter_return
     } else {
Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	16 Jul 2007 00:54:16 -0000	1.44
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	12 Oct 2007 07:21:49 -0000	1.45
@@ -158,7 +158,7 @@
 
 } {
     ns_log debug "OACS= sec_login_handler: enter"
-
+ns_log notice "--login handler"
     set auth_level none
     set new_user_id 0
     set untrusted_user_id 0
@@ -186,6 +186,7 @@
         # Check authentication cookie
         # First, check expiration 
         if { [sec_login_timeout] == 0 || [ns_time] - $login_expr < [sec_login_timeout] } {
+ns_log notice "-CHECK AUTH TOKEN"
             # Then check auth_token
             if {$auth_token eq [sec_get_user_auth_token $untrusted_user_id]} {
                 # Are we secure?
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 -N -r1.100 -r1.101
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	25 Sep 2007 15:22:38 -0000	1.100
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	12 Oct 2007 07:21:49 -0000	1.101
@@ -1723,15 +1723,16 @@
    It returns status 200 and all headers including
    any added to outputheaders.
 } {
+
+   if {[string match "text/*" $content_type] && ![string match *charset=* $content_type]} {
+     append content_type "; charset=[ns_config ns/parameters OutputCharset iso-8859-1]"
+   }
+
    set all_the_headers "HTTP/1.0 200 OK
 MIME-Version: 1.0
 Content-Type: $content_type\r\n"
     util_WriteWithExtraOutputHeaders $all_the_headers
-    if {[string match "text/*" $content_type]} {
-      if {![string match *charset=* $content_type]} {
-	append content_type \
-	    "; charset=[ns_config ns/parameters OutputCharset iso-8859-1]"
-      }
+   if {[string match "text/*" $content_type]} {
       ns_startcontent -type $content_type
     } else {
       ns_startcontent