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:04:28 UTC

svn commit: r1070813 - in /tcl/rivet/branches/neh: ./ ChangeLog src/apache-2/mod_rivet.c src/apache-2/rivetCore.c

Author: mxmanghi
Date: Tue Feb 15 09:04:27 2011
New Revision: 1070813

URL: http://svn.apache.org/viewvc?rev=1070813&view=rev
Log:
merging commits to trunk into branches/neh

Modified:
    tcl/rivet/branches/neh/   (props changed)
    tcl/rivet/branches/neh/ChangeLog
    tcl/rivet/branches/neh/src/apache-2/mod_rivet.c
    tcl/rivet/branches/neh/src/apache-2/rivetCore.c

Propchange: tcl/rivet/branches/neh/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 09:04:27 2011
@@ -1,2 +1,3 @@
 /tcl/rivet/branches/2_0:939332-1027850
 /tcl/rivet/branches/master-interp:1062190-1065801
+/tcl/rivet/trunk:1069501-1070812

Modified: tcl/rivet/branches/neh/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/neh/ChangeLog?rev=1070813&r1=1070812&r2=1070813&view=diff
==============================================================================
--- tcl/rivet/branches/neh/ChangeLog (original)
+++ tcl/rivet/branches/neh/ChangeLog Tue Feb 15 09:04:27 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-11 Massimo Manghi <mx...@apache.org>
     * src/apache-2/mod_rivet.[c|h]: new conf scripts rivet_abort_script and rivet_force_script. rivet_abort_script
     is run when an abort_page command is called in the page content generation

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=1070813&r1=1070812&r2=1070813&view=diff
==============================================================================
--- tcl/rivet/branches/neh/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/neh/src/apache-2/mod_rivet.c Tue Feb 15 09:04:27 2011
@@ -662,8 +662,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;
@@ -1476,7 +1474,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/neh/src/apache-2/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/neh/src/apache-2/rivetCore.c?rev=1070813&r1=1070812&r2=1070813&view=diff
==============================================================================
--- tcl/rivet/branches/neh/src/apache-2/rivetCore.c (original)
+++ tcl/rivet/branches/neh/src/apache-2/rivetCore.c Tue Feb 15 09:04:27 2011
@@ -820,7 +820,6 @@ TCL_CMD_HEADER( Rivet_ApacheTable )
 TCL_CMD_HEADER( Rivet_Upload )
 {
     char *varname = NULL;
-    char *command = NULL;
 
     int subcommandindex;
 
@@ -852,7 +851,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",
@@ -1226,7 +1224,6 @@ TCL_CMD_HEADER( Rivet_VirtualFilenameCmd
 
 TCL_CMD_HEADER( Rivet_LogErrorCmd )
 {
-    char *loglevel = NULL;
     char *message = NULL;
 
     server_rec *serverRec;
@@ -1264,7 +1261,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