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/12/14 02:03:51 UTC
cvs commit: tcl-rivet/src mod_rivet.c mod_rivet.h
davidw 2002/12/13 17:03:51
Modified: . ChangeLog
src mod_rivet.c mod_rivet.h
Log:
* src/mod_rivet.c (Rivet_InitTclStuff): Apache actually loads all the
modules twice, just to see if it can. This is a pain, because things
don't seem to get completely cleaned up on the Tcl side. So this
little hack should make us *really* load only the second time
around.
Revision Changes Path
1.88 +8 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog 11 Dec 2002 06:41:55 -0000 1.87
+++ ChangeLog 14 Dec 2002 01:03:51 -0000 1.88
@@ -1,3 +1,11 @@
+2002-12-13 David N. Welton <da...@dedasys.com>
+
+ * src/mod_rivet.c (Rivet_InitTclStuff): Apache actually loads all
+ the modules twice, just to see if it can. This is a pain,
+ because things don't seem to get completely cleaned up on the
+ Tcl side. So this little hack should make us *really* load only
+ the second time around.
+
2002-12-10 David N. Welton <da...@dedasys.com>
* table.png: Transformed table.png so that it ought to display
1.56 +12 -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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mod_rivet.c 9 Dec 2002 22:40:52 -0000 1.55
+++ mod_rivet.c 14 Dec 2002 01:03:51 -0000 1.56
@@ -385,6 +385,7 @@
rivet_server_conf *rdc;
Tcl_MutexLock(sendMutex);
+
rsc = Rivet_GetConf(r);
interp = rsc->server_interp;
globals = Tcl_GetAssocData(interp, "rivet", NULL);
@@ -594,8 +595,17 @@
rivet_server_conf *rsc = RIVET_SERVER_CONF( s->module_config );
server_rec *sr;
- /* Initialize TCL stuff */
+ /* Apache actually loads all the modules twice, just to see if it
+ * can. This is a pain, because things don't seem to get
+ * completely cleaned up on the Tcl side. So this little hack
+ * should make us *really* load only the second time around. */
+
+ if (getenv("RIVET_INIT") == NULL) {
+ setenv("RIVET_INIT", "1", 0);
+ return;
+ }
+ /* Initialize TCL stuff */
Tcl_FindExecutable(NULL);
interp = Tcl_CreateInterp();
1.23 +1 -0 tcl-rivet/src/mod_rivet.h
Index: mod_rivet.h
===================================================================
RCS file: /home/cvs/tcl-rivet/src/mod_rivet.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_rivet.h 22 Oct 2002 18:21:47 -0000 1.22
+++ mod_rivet.h 14 Dec 2002 01:03:51 -0000 1.23
@@ -79,6 +79,7 @@
/* stuff for buffering output */
Tcl_Channel *outchannel;
+
} rivet_server_conf;
/* eventually we will transfer 'global' variables in here and
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org