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 da...@apache.org on 2002/03/14 06:23:54 UTC
cvs commit: tcl-rivet/src mod_rivet.c mod_rivet.h
damonc 02/03/13 21:23:54
Modified: src mod_rivet.c mod_rivet.h
Log:
Just some cleanup.
Revision Changes Path
1.39 +3 -2 tcl-rivet/src/mod_rivet.c
Index: mod_rivet.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/mod_rivet.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_rivet.c 14 Mar 2002 00:18:59 -0000 1.38
+++ mod_rivet.c 14 Mar 2002 05:23:54 -0000 1.39
@@ -55,7 +55,7 @@
* originally written at the National Center for Supercomputing Applications,
* University of Illinois, Urbana-Champaign. */
-/* $Id: mod_rivet.c,v 1.38 2002/03/14 00:18:59 damonc Exp $ */
+/* $Id: mod_rivet.c,v 1.39 2002/03/14 05:23:54 damonc Exp $ */
/* mod_rivet.c by David Welton <da...@apache.org>
* and Damon Courtney <da...@unreality.com>
@@ -270,6 +270,7 @@
static void
Rivet_CleanupRequest( request_rec *r )
{
+#if 0
rivet_server_conf *rdc = RIVET_SERVER_CONF( r->per_dir_config );
if( rdc->rivet_before_script ) {
@@ -281,6 +282,7 @@
if( rdc->rivet_error_script ) {
Tcl_DecrRefCount( rdc->rivet_error_script );
}
+#endif
}
static void
@@ -842,7 +844,6 @@
Rivet_MergeDirConfigVars( r->pool, newconfig, rsc, rdc );
return newconfig;
- return rsc;
}
static void
1.19 +8 -6 tcl-rivet/src/mod_rivet.h
Index: mod_rivet.h
===================================================================
RCS file: /home/cvs/tcl-rivet/src/mod_rivet.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_rivet.h 13 Mar 2002 06:51:18 -0000 1.18
+++ mod_rivet.h 14 Mar 2002 05:23:54 -0000 1.19
@@ -36,8 +36,8 @@
/* #define RIVET_VERSION "X.X.X" */
typedef struct {
- Tcl_Interp *server_interp; /* per server Tcl interpreter */
- Tcl_Obj *rivet_global_init_script; /* run once when apache is first started */
+ Tcl_Interp *server_interp; /* per server Tcl interpreter */
+ Tcl_Obj *rivet_global_init_script; /* run once when apache is started */
Tcl_Obj *rivet_child_init_script;
Tcl_Obj *rivet_child_exit_script;
Tcl_Obj *rivet_before_script; /* script run before each page */
@@ -69,12 +69,14 @@
TclWebRequest *req; /* TclWeb API request */
} rivet_interp_globals;
-int Rivet_ParseExecFile(TclWebRequest *req, char *filename,
- int toplevel);
+int Rivet_ParseExecFile(TclWebRequest *req, char *filename, int toplevel);
+
rivet_server_conf *Rivet_GetConf(request_rec *r);
-#define RIVET_SERVER_CONF(module) (rivet_server_conf *)ap_get_module_config(module, &rivet_module)
+#define RIVET_SERVER_CONF(module) \
+ (rivet_server_conf *)ap_get_module_config(module, &rivet_module)
-#define RIVET_NEW_CONF(p) (rivet_server_conf *)ap_pcalloc(p, sizeof(rivet_server_conf))
+#define RIVET_NEW_CONF(p) \
+ (rivet_server_conf *)ap_pcalloc(p, sizeof(rivet_server_conf))
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-dev-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-dev-help@tcl.apache.org