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 2013/01/29 23:16:01 UTC
svn commit: r1440182 - in /tcl/rivet/trunk: ChangeLog Makefile.in
src/apache-2/mod_rivet.c src/apache-2/mod_rivet.h src/apache-2/rivetCore.c
Author: mxmanghi
Date: Tue Jan 29 22:16:01 2013
New Revision: 1440182
URL: http://svn.apache.org/viewvc?rev=1440182&view=rev
Log:
* src/apache-2/mod_rivet.[c|h],rivetCore.c: removed hardcoded error code
generated by abort_page and defined in the preprocessor symbol ABORTCODE.
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/src/apache-2/mod_rivet.c
tcl/rivet/trunk/src/apache-2/mod_rivet.h
tcl/rivet/trunk/src/apache-2/rivetCore.c
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1440182&r1=1440181&r2=1440182&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue Jan 29 22:16:01 2013
@@ -1,3 +1,7 @@
+2013-01-28 Massimo Manghi <mx...@apache.org>
+ * src/apache-2/mod_rivet.[c|h],rivetCore.c: removed hardcoded error code
+ generated by abort_page and defined in the preprocessor symbol ABORTCODE.
+
2013-01-25 Massimo Manghi <mx...@apache.org>
* rivet/rivet-tcl/xml.tcl,rivet/rivet-tcl/tclIndex: New command for XML fragments
composition
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1440182&r1=1440181&r2=1440182&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Tue Jan 29 22:16:01 2013
@@ -18,7 +18,7 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 1024231 2010-10-19 13:39:17Z mxmanghi $
+# $Id: Makefile.am 1436690 2013-01-21 23:40:42Z 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
Modified: tcl/rivet/trunk/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/mod_rivet.c?rev=1440182&r1=1440181&r2=1440182&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/trunk/src/apache-2/mod_rivet.c Tue Jan 29 22:16:01 2013
@@ -370,7 +370,7 @@ Rivet_ExecuteAndCheck(Tcl_Interp *interp
ap_assert (Tcl_ListObjIndex (interp, errorCodeListObj, 1, &errorCodeElementObj) == TCL_OK);
errorCodeSubString = Tcl_GetString (errorCodeElementObj);
- if (strcmp (errorCodeSubString, "ABORTPAGE") == 0)
+ if (strcmp (errorCodeSubString, ABORTPAGE_CODE) == 0)
{
if (conf->rivet_abort_script)
{
@@ -1252,7 +1252,7 @@ Rivet_InitHandler(apr_pool_t *pPool, apr
rivet_panic_server_rec = s;
#if RIVET_DISPLAY_VERSION
- ap_add_version_component(pPool, RIVET_PACKAGE_NAME"/"RIVET_PACKAGE_VERSION);
+ ap_add_version_component(pPool, RIVET_PACKAGE_NAME"/"RIVET_VERSION);
#else
ap_add_version_component(pPool, RIVET_PACKAGE_NAME);
#endif
Modified: tcl/rivet/trunk/src/apache-2/mod_rivet.h
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/mod_rivet.h?rev=1440182&r1=1440181&r2=1440182&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/mod_rivet.h (original)
+++ tcl/rivet/trunk/src/apache-2/mod_rivet.h Tue Jan 29 22:16:01 2013
@@ -140,5 +140,10 @@ Tcl_Obj* Rivet_ReadConfParameter ( Tcl_
Tcl_Obj* Rivet_CurrentConfDict ( Tcl_Interp* interp,
rivet_server_conf* rivet_conf);
+
+/* error code set by command 'abort_page' */
+
+#define ABORTPAGE_CODE "ABORTPAGE"
+
#endif /* MOD_RIVET_H */
Modified: tcl/rivet/trunk/src/apache-2/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/rivetCore.c?rev=1440182&r1=1440181&r2=1440182&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/rivetCore.c (original)
+++ tcl/rivet/trunk/src/apache-2/rivetCore.c Tue Jan 29 22:16:01 2013
@@ -1139,7 +1139,7 @@ TCL_CMD_HEADER( Rivet_AbortPageCmd )
globals->page_aborting = 1;
Tcl_AddErrorInfo (interp, errorMessage);
- Tcl_SetErrorCode (interp, "RIVET", "ABORTPAGE", errorMessage, (char *)NULL);
+ Tcl_SetErrorCode (interp, "RIVET", ABORTPAGE_CODE, errorMessage, (char *)NULL);
return TCL_ERROR;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org