You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2011/02/10 19:39:39 UTC
svn commit: r1069515 - in /tcl/rivet/branches/neh/src/apache-2: mod_rivet.c
mod_rivet.h
Author: mxmanghi
Date: Thu Feb 10 18:39:39 2011
New Revision: 1069515
URL: http://svn.apache.org/viewvc?rev=1069515&view=rev
Log:
new global variables for page exception handling
Modified:
tcl/rivet/branches/neh/src/apache-2/mod_rivet.c
tcl/rivet/branches/neh/src/apache-2/mod_rivet.h
Modified: tcl/rivet/branches/neh/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/neh/src/apache-2/mod_rivet.c?rev=1069515&r1=1069514&r2=1069515&view=diff
==============================================================================
--- tcl/rivet/branches/neh/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/neh/src/apache-2/mod_rivet.c Thu Feb 10 18:39:39 2011
@@ -327,6 +327,7 @@ Rivet_ExecuteAndCheck(Tcl_Interp *interp
*/
errorCodeListObj = Tcl_GetVar2Ex (interp, "errorCode", (char *)NULL, TCL_GLOBAL_ONLY);
+
/* errorCode is guaranteed to be set to NONE, but let's make sure
* anyway rather than causing a SIGSEGV
*/
Modified: tcl/rivet/branches/neh/src/apache-2/mod_rivet.h
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/neh/src/apache-2/mod_rivet.h?rev=1069515&r1=1069514&r2=1069515&view=diff
==============================================================================
--- tcl/rivet/branches/neh/src/apache-2/mod_rivet.h (original)
+++ tcl/rivet/branches/neh/src/apache-2/mod_rivet.h Thu Feb 10 18:39:39 2011
@@ -77,17 +77,21 @@ typedef struct _rivet_server_conf {
apr_table_t *rivet_dir_vars;
apr_table_t *rivet_user_vars;
char **objCacheList; /* Array of cached objects (for priority handling) */
- Tcl_HashTable *objCache; /* Objects cache - the key is the script name */
+ Tcl_HashTable *objCache; /* Objects cache - the key is the script name */
- Tcl_Channel *outchannel; /* stuff for buffering output */
+ Tcl_Channel *outchannel; /* stuff for buffering output */
} rivet_server_conf;
/* eventually we will transfer 'global' variables in here and
'de-globalize' them */
typedef struct _rivet_interp_globals {
- request_rec *r; /* request rec */
- TclWebRequest *req; /* TclWeb API request */
+ request_rec* r; /* request rec */
+ TclWebRequest* req; /* TclWeb API request */
+ int page_aborting; /* set by abort_page. */
+ /* to be reset by Rivet_SendContent */
+ Tcl_Obj* abort_code;
+
} rivet_interp_globals;
int Rivet_ParseExecFile(TclWebRequest *req, char *filename, int toplevel);
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org