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/03/29 02:30:48 UTC

svn commit: r1086452 - /tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c

Author: mxmanghi
Date: Tue Mar 29 00:30:48 2011
New Revision: 1086452

URL: http://svn.apache.org/viewvc?rev=1086452&view=rev
Log:
removed Tcl_PkgRequire for rivetlib as it's known to crash Apache

Modified:
    tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.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=1086452&r1=1086451&r2=1086452&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 Mar 29 00:30:48 2011
@@ -271,6 +271,7 @@ Rivet_InitServerVariables( Tcl_Interp *i
             TCL_GLOBAL_ONLY);
     Tcl_DecrRefCount(obj);
 
+#if RIVET_DISPLAY_VERSION
     obj = Tcl_NewStringObj(RIVET_PACKAGE_VERSION, -1);
     Tcl_IncrRefCount(obj);
     Tcl_SetVar2Ex(interp,
@@ -279,6 +280,7 @@ Rivet_InitServerVariables( Tcl_Interp *i
             obj,
             TCL_GLOBAL_ONLY);
     Tcl_DecrRefCount(obj);
+#endif
 }
 
 static void
@@ -957,8 +959,7 @@ Rivet_PerInterpInit(server_rec *s, rivet
     * shortly after the extension library is loaded.
     * The problem was investigated on Linux and it became clear 
     * that it's linked to the way Tcl calls dlopen (Bug #3216070)
-    * The problem could be solved in Tcl8.6
-    */
+    * The problem could be solved in Tcl8.6 
 
     if (Tcl_PkgRequire(interp, RIVETLIB_TCL_PACKAGE, "1.2", 1) == NULL)
     {
@@ -966,6 +967,7 @@ Rivet_PerInterpInit(server_rec *s, rivet
                 "Error loading rivetlib package: %s", Tcl_GetStringResult(interp) );
         exit(1);
     } 
+    */
 
     /* Set the output buffer size to the largest allowed value, so that we 
      * won't send any result packets to the browser unless the Rivet



---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org