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/25 11:18:38 UTC
svn commit: r1834303 - in /tcl/rivet/trunk: ChangeLog Makefile.in
rivet/init.tcl rivet/init.tcl.in
Author: mxmanghi
Date: Mon Jun 25 11:18:38 2018
New Revision: 1834303
URL: http://svn.apache.org/viewvc?rev=1834303&view=rev
Log:
* rivet/init.tcl.it: the error handler of error scripts requires
::Rivet::script to keep the actual 'script' being run
(reintegrated into trunk from branches/3.0)
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/rivet/init.tcl
tcl/rivet/trunk/rivet/init.tcl.in
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1834303&r1=1834302&r2=1834303&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Mon Jun 25 11:18:38 2018
@@ -1,3 +1,8 @@
+2018-06-25 Massimo Manghi <mx...@apache.org>
+ * rivet/init.tcl.it: the error handler of error scripts requires
+ ::Rivet::script to keep the actual 'script' being run
+ (reintegrated into trunk from branches/3.0)
+
2018-06-18 Massimo Manghi <mx...@apache.org>
* rivet/packages/dio/*.tcl: fully qualifying calls to ::rivet::lempty
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1834303&r1=1834302&r2=1834303&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Mon Jun 25 11:18:38 2018
@@ -17,7 +17,7 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 1802791 2017-07-24 11:47:04Z mxmanghi $
+# $Id: Makefile.am 1825602 2018-02-28 20:45:34Z mxmanghi $
#
# 2007/12/25: Added target uninistall-local that removes the tcl stuff (mxmanghi)
# 2010/06/22: target instal-data-local searches for pkgIndex.tcl files and deletes them
@@ -929,8 +929,8 @@ install-binaries:
echo 'running target install-binaries ($(RIVETLIB_DESTDIR))'
$(mkinstalldirs) $(RIVETLIB_DESTDIR)
$(mkinstalldirs) $(RIVETLIB_DESTDIR)/rivet-tcl
- $(install_sh) -C $(builddir)/rivet/init.tcl $(RIVETLIB_DESTDIR)
- $(install_sh) -C $(builddir)/rivet/default_request_handler.tcl $(RIVETLIB_DESTDIR)
+ $(install_sh) -C -m 644 $(builddir)/rivet/init.tcl $(RIVETLIB_DESTDIR)
+ $(install_sh) -C -m 644 $(builddir)/rivet/default_request_handler.tcl $(RIVETLIB_DESTDIR)
$(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/rivet-tcl/*) $(RIVETLIB_DESTDIR)/rivet-tcl
#cp -rv $(srcdir)/rivet/packages $(RIVETLIB_DESTDIR)/
Modified: tcl/rivet/trunk/rivet/init.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/init.tcl?rev=1834303&r1=1834302&r2=1834303&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/init.tcl (original)
+++ tcl/rivet/trunk/rivet/init.tcl Mon Jun 25 11:18:38 2018
@@ -201,6 +201,7 @@ proc ::Rivet::finish_request {script err
}
::try {
+ set ::Rivet::script $script
uplevel #0 $error_script
} on error {err} {
::rivet::apache_log_error err "Rivet ErrorScript failed: $::errorInfo"
Modified: tcl/rivet/trunk/rivet/init.tcl.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/init.tcl.in?rev=1834303&r1=1834302&r2=1834303&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/init.tcl.in (original)
+++ tcl/rivet/trunk/rivet/init.tcl.in Mon Jun 25 11:18:38 2018
@@ -201,7 +201,7 @@ proc ::Rivet::finish_request {script err
}
::try {
- set ::Rivet::script $error_script
+ set ::Rivet::script $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