You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2018/06/14 14:31:49 UTC
svn commit: r1833509 - in /tcl/rivet/branches/3.0: ./ ChangeLog
rivet/init.tcl.in
Author: mxmanghi
Date: Thu Jun 14 14:31:49 2018
New Revision: 1833509
URL: http://svn.apache.org/viewvc?rev=1833509&view=rev
Log:
merging latest changes in trunk
Modified:
tcl/rivet/branches/3.0/ (props changed)
tcl/rivet/branches/3.0/ChangeLog
tcl/rivet/branches/3.0/rivet/init.tcl.in
Propchange: tcl/rivet/branches/3.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 14 14:31:49 2018
@@ -4,3 +4,4 @@
/tcl/rivet/branches/modular:1486173-1588076
/tcl/rivet/branches/neh:1069501-1076014
/tcl/rivet/branches/rivet-namespace:1065843-1211714
+/tcl/rivet/trunk:1830741-1833508
Modified: tcl/rivet/branches/3.0/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/3.0/ChangeLog?rev=1833509&r1=1833508&r2=1833509&view=diff
==============================================================================
--- tcl/rivet/branches/3.0/ChangeLog (original)
+++ tcl/rivet/branches/3.0/ChangeLog Thu Jun 14 14:31:49 2018
@@ -1,3 +1,8 @@
+2018-06-14 Massimo Manghi <mx...@apache.org>
+ * rivet/init.tcl: fixed bug in error scripts' error handling (the
+ case of handling an error that occurs in the default error script may
+ need the introduction of a new test
+
2018-04-09 Massimo Manghi <mx...@apache.org>
* src/mod_rivet_ng/mod_rivet.h: changing argument list of function
*mpm_thread_interp in the bridge interface. It must work
Modified: tcl/rivet/branches/3.0/rivet/init.tcl.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/3.0/rivet/init.tcl.in?rev=1833509&r1=1833508&r2=1833509&view=diff
==============================================================================
--- tcl/rivet/branches/3.0/rivet/init.tcl.in (original)
+++ tcl/rivet/branches/3.0/rivet/init.tcl.in Thu Jun 14 14:31:49 2018
@@ -201,6 +201,7 @@ proc ::Rivet::finish_request {script err
}
::try {
+ set ::Rivet::script $error_script
uplevel #0 $error_script
} on error {err} {
::rivet::apache_log_error err "Rivet ErrorScript failed: $::errorInfo"
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org