Index: openacs-4/packages/acs-kernel/acs-kernel.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v diff -u -r1.132 -r1.133 --- openacs-4/packages/acs-kernel/acs-kernel.info 2 May 2015 16:47:49 -0000 1.132 +++ openacs-4/packages/acs-kernel/acs-kernel.info 15 May 2015 14:30:02 -0000 1.133 @@ -6,79 +6,82 @@ Kernel Services t t + f + t - + OpenACS Core Team Routines and data models providing the foundation for OpenACS-based Web services. 2013-09-08 OpenACS The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures. 3 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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.114 -r1.115 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 27 Oct 2014 16:40:07 -0000 1.114 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 15 May 2015 14:30:02 -0000 1.115 @@ -488,6 +488,22 @@ if { ![rp_file_can_be_public_p $path] } { ad_raise notfound } + set expireTime [parameter::get -package_id [ad_acs_kernel_id] -parameter ResourcesExpireInterval -default 0] + if {$expireTime != 0} { + if {![string is integer -strict $expireTime]} { + if {[regexp {^(\d)+d} $expireTime _ t]} { + set expireTime [expr {60*60*24*$t}] + } elseif {[regexp {^(\d)+h} $expireTime _ t]} { + set expireTime [expr {60*60*$t}] + } elseif {[regexp {^(\d)+m} $expireTime _ t]} { + set expireTime [expr {60*$t}] + } else { + ns_log error "invalid expire time '$expireTime' specified" + set expireTime 0 + } + } + ns_setexpires $expireTime + } ns_returnfile 200 [ns_guesstype $path] $path return filter_return }