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/15 10:05:15 UTC
svn commit: r1070814 - in /tcl/rivet/branches/rivet-namespace: ./ ChangeLog
src/apache-2/mod_rivet.c src/apache-2/rivetCore.c
Author: mxmanghi
Date: Tue Feb 15 09:05:15 2011
New Revision: 1070814
URL: http://svn.apache.org/viewvc?rev=1070814&view=rev
Log:
merging commits to trunk into branches/rivet-namespace
Modified:
tcl/rivet/branches/rivet-namespace/ (props changed)
tcl/rivet/branches/rivet-namespace/ChangeLog
tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c
tcl/rivet/branches/rivet-namespace/src/apache-2/rivetCore.c
Propchange: tcl/rivet/branches/rivet-namespace/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 09:05:15 2011
@@ -1,3 +1,3 @@
/tcl/rivet/branches/2_0:939332-1027850
/tcl/rivet/branches/master-interp:1062190-1065801
-/tcl/rivet/trunk:1065843-1068235
+/tcl/rivet/trunk:1065843-1070813
Modified: tcl/rivet/branches/rivet-namespace/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/ChangeLog?rev=1070814&r1=1070813&r2=1070814&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/ChangeLog (original)
+++ tcl/rivet/branches/rivet-namespace/ChangeLog Tue Feb 15 09:05:15 2011
@@ -1,3 +1,7 @@
+2011-02-14 Karl Lehenbauer <ka...@apache.org>
+ * src/apache-2/mod_rivet.c: Only create root interpreter once, not twice. In Rivet_CopyConfig cache_size and cache_free were getting copied twice. Only once now.
+ * src/apache-2/rivetCore.c: Remove unused command var from Rivet_Upload. Remove unneeded loglevel var from Rivet_LogErrorCmd.
+
2011-02-08 Massimo Manghi <mx...@apache.org>
* src/apache-2/rivetCore.c: call to Rivet_InitWWW to include into Rivet's core the commands provided in
src/rivetWWW.c
Modified: tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c?rev=1070814&r1=1070813&r2=1070814&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c Tue Feb 15 09:05:15 2011
@@ -640,8 +640,6 @@ Rivet_CopyConfig( rivet_server_conf *old
/* These are pointers so that they can be passed around... */
newrsc->cache_size = oldrsc->cache_size;
newrsc->cache_free = oldrsc->cache_free;
- newrsc->cache_size = oldrsc->cache_size;
- newrsc->cache_free = oldrsc->cache_free;
newrsc->upload_max = oldrsc->upload_max;
newrsc->upload_files_to_var = oldrsc->upload_files_to_var;
newrsc->separate_virtual_interps = oldrsc->separate_virtual_interps;
@@ -986,8 +984,7 @@ Rivet_AssignStringToConf (Tcl_Obj** objP
static const char *
-Rivet_SetScript (apr_pool_t *pool, rivet_server_conf *rsc,
- const char *script, const char *string)
+Rivet_SetScript (apr_pool_t *pool, rivet_server_conf *rsc, const char *script, const char *string)
{
Tcl_Obj *objarg = NULL;
@@ -1452,7 +1449,7 @@ Rivet_ChildExit(void *data)
static Tcl_Interp*
Rivet_CreateTclInterp (server_rec* s)
{
- Tcl_Interp* interp = Tcl_CreateInterp();
+ Tcl_Interp* interp;
/* Initialize TCL stuff */
Tcl_FindExecutable(RIVET_NAMEOFEXECUTABLE);
Modified: tcl/rivet/branches/rivet-namespace/src/apache-2/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/src/apache-2/rivetCore.c?rev=1070814&r1=1070813&r2=1070814&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/src/apache-2/rivetCore.c (original)
+++ tcl/rivet/branches/rivet-namespace/src/apache-2/rivetCore.c Tue Feb 15 09:05:15 2011
@@ -822,7 +822,6 @@ TCL_CMD_HEADER( Rivet_ApacheTable )
TCL_CMD_HEADER( Rivet_Upload )
{
char *varname = NULL;
- char *command = NULL;
int subcommandindex;
@@ -854,7 +853,6 @@ TCL_CMD_HEADER( Rivet_Upload )
};
rivet_interp_globals *globals = Tcl_GetAssocData(interp, "rivet", NULL);
- command = Tcl_GetString(objv[1]);
if (Tcl_GetIndexFromObj(interp, objv[1], SubCommand,
"channel|save|data|exists|size|type|filename|names|tempname"
"|tempname|names",
@@ -1149,7 +1147,6 @@ TCL_CMD_HEADER( Rivet_VirtualFilenameCmd
TCL_CMD_HEADER( Rivet_LogErrorCmd )
{
- char *loglevel = NULL;
char *message = NULL;
server_rec *serverRec;
@@ -1187,7 +1184,6 @@ TCL_CMD_HEADER( Rivet_LogErrorCmd )
return TCL_ERROR;
}
- loglevel = Tcl_GetString(objv[1]);
message = Tcl_GetString (objv[2]);
if (Tcl_GetIndexFromObj(interp, objv[1], logLevel,
"emerg|alert|crit|err|warning|notice|info|debug",
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org