You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2012/12/18 01:26:56 UTC
svn commit: r1423233 - in /tcl/rivet/branches/debian-apache2.2: ./ patches/
Author: mxmanghi
Date: Tue Dec 18 00:26:54 2012
New Revision: 1423233
URL: http://svn.apache.org/viewvc?rev=1423233&view=rev
Log:
storing patches taken from trunk
Added:
tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch
tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch
tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch
tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch
tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch
Modified:
tcl/rivet/branches/debian-apache2.2/changelog
tcl/rivet/branches/debian-apache2.2/patches/series
Modified: tcl/rivet/branches/debian-apache2.2/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/changelog?rev=1423233&r1=1423232&r2=1423233&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/changelog (original)
+++ tcl/rivet/branches/debian-apache2.2/changelog Tue Dec 18 00:26:54 2012
@@ -1,8 +1,10 @@
libapache2-mod-rivet (2.1.0-1) unstable; urgency=low
* New upstream release 2.1.0
+ * Applied patches to fix minor bugs in version 2.1.0 and improve
+ command '::rivet::headers' error reporting
- -- Massimo Manghi <mx...@apache.org> Mon, 10 Dec 2012 00:06:55 +0100
+ -- Massimo Manghi <mx...@apache.org> Mon, 17 Dec 2012 00:06:55 +0100
libapache2-mod-rivet (2.0.5-1) unstable; urgency=low
Added: tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch?rev=1423233&view=auto
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch (added)
+++ tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch Tue Dec 18 00:26:54 2012
@@ -0,0 +1,18 @@
+--- a/src/librivet/rivetPkgInit.c
++++ b/src/librivet/rivetPkgInit.c
+@@ -110,7 +110,7 @@
+ Tcl_Export(interp,rivet_ns,"*",0);
+ #endif
+
+- return Tcl_PkgProvide( interp, RIVETLIB_TCL_PACKAGE, "1.2" );
++ return Tcl_PkgProvide( interp, RIVETLIB_TCL_PACKAGE, RIVET_VERSION );
+ }
+
+ /*-----------------------------------------------------------------------------
+@@ -148,5 +148,5 @@
+ rivet_ns = Rivet_GetNamespace(interp);
+ Tcl_Export(interp,rivet_ns,"*",0);
+ #endif
+- return Tcl_PkgProvide( interp, RIVETLIB_TCL_PACKAGE, "1.2" );
++ return Tcl_PkgProvide( interp, RIVETLIB_TCL_PACKAGE, RIVET_VERSION );
+ }
Added: tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch?rev=1423233&view=auto
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch (added)
+++ tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch Tue Dec 18 00:26:54 2012
@@ -0,0 +1,82 @@
+--- a/src/apache-2/mod_rivet.c
++++ b/src/apache-2/mod_rivet.c
+@@ -15,7 +15,7 @@
+ limitations under the License.
+ */
+
+-/* $Id: mod_rivet.c 1374729 2012-08-19 11:09:10Z mxmanghi $ */
++/* $Id: mod_rivet.c 1421053 2012-12-13 00:32:03Z mxmanghi $ */
+
+ /* Rivet config */
+ #ifdef HAVE_CONFIG_H
+@@ -924,7 +924,7 @@
+ /* Eval Rivet's init.tcl file to load in the Tcl-level commands. */
+
+ /* We put in front the auto_path list the path to the directory where
+- * init.tcl is located (provides package RivetTcl)
++ * init.tcl is located (provides package Rivet, previously RivetTcl)
+ */
+
+ auto_path = Tcl_GetVar2Ex(interp,"auto_path",NULL,TCL_GLOBAL_ONLY);
+@@ -947,21 +947,35 @@
+ Rivet_InitServerVariables(interp, p );
+ // Rivet_PropagateServerConfArray( interp, rsc );
+
+- /* Eval Rivet's init.tcl file to load in the Tcl-level commands. */
+
+- /* Watch out! Calling Tcl_PkgRequire with a version number binds this module to
+- * the 'package provide' statement in rivet/init.tcl
++ /* Loading into the interpreter the commands provided by librivet.so */
++ /* Tcl Bug #3216070 has been solved with 8.5.10 and commands shipped with
++ * Rivetlib can be mapped at this stage
+ */
+
+- /* If rivet was configured to export the ::rivet namespace commands we have to
+- * set the array variable ::rivet::module_conf(export_namespace_commands) before calling init.tcl
++ if (Tcl_PkgRequire(interp, RIVETLIB_TCL_PACKAGE, RIVET_VERSION, 1) == NULL)
++ {
++ ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, s,
++ MODNAME ": Error loading rivetlib package: %s",
++ Tcl_GetStringResult(interp) );
++ exit(1);
++ }
++
++ /* If rivet is configured to export the ::rivet namespace commands we set the
++ * array variable ::rivet::module_conf(export_namespace_commands) before calling init.tcl
+ * This array will be unset after commands are exported.
+ */
+
+ Tcl_SetVar2Ex(interp,"module_conf","export_namespace_commands",Tcl_NewIntObj(RIVET_NAMESPACE_EXPORT),0);
+ Tcl_SetVar2Ex(interp,"module_conf","import_rivet_commands",Tcl_NewIntObj(RIVET_NAMESPACE_IMPORT),0);
+
+- if (Tcl_PkgRequire(interp, "RivetTcl", "2.1", 1) == NULL)
++ /* Eval Rivet's init.tcl file to load in the Tcl-level commands. */
++
++ /* Watch out! Calling Tcl_PkgRequire with a version number binds this module to
++ * the Rivet package revision number in rivet/init.tcl
++ */
++
++ if (Tcl_PkgRequire(interp, "Rivet", "2.1", 1) == NULL)
+ {
+ ap_log_error (APLOG_MARK, APLOG_ERR, APR_EGENERAL, s,
+ MODNAME ": init.tcl must be installed correctly for Apache Rivet to function: %s (%s)",
+@@ -969,19 +983,6 @@
+ exit(1);
+ }
+
+- /* Loading into the interpreter the commands provided by librivet.so */
+-
+- /* Tcl Bug #3216070 has been solved with 8.5.10 and commands shipped with
+- * Rivetlib can be mapped at this stage
+- */
+-
+- if (Tcl_PkgRequire(interp, RIVETLIB_TCL_PACKAGE, "1.2", 1) == NULL)
+- {
+- ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, s,
+- MODNAME ": Error loading rivetlib package: %s",
+- Tcl_GetStringResult(interp) );
+- exit(1);
+- }
+ /* */
+
+ /* Set the output buffer size to the largest allowed value, so that we
Added: tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch?rev=1423233&view=auto
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch (added)
+++ tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch Tue Dec 18 00:26:54 2012
@@ -0,0 +1,37 @@
+--- a/src/apache-2/rivetCore.c
++++ b/src/apache-2/rivetCore.c
+@@ -17,7 +17,7 @@
+ limitations under the License.
+ */
+
+-/* $Id: rivetCore.c 1335266 2012-05-07 21:20:11Z mxmanghi $ */
++/* $Id: rivetCore.c 1422710 2012-12-16 23:12:29Z mxmanghi $ */
+
+ /* Rivet config */
+ #ifdef HAVE_CONFIG_H
+@@ -351,7 +351,8 @@
+ return TCL_ERROR;
+ }
+ TclWeb_SetHeaderType(Tcl_GetString(objv[2]), globals->req);
+- } else if (!strcmp("numeric", opt)) /* ### numeric ### */
++ }
++ else if (!strcmp("numeric", opt)) /* ### numeric ### */
+ {
+ int st = 200;
+
+@@ -365,7 +366,15 @@
+ } else {
+ return TCL_ERROR;
+ }
++
+ } else {
++
++ Tcl_Obj* result = Tcl_NewStringObj("unrecognized subcommand: ",-1);
++ Tcl_IncrRefCount(result);
++ Tcl_AppendStringsToObj(result,opt,NULL);
++
++ Tcl_SetObjResult(interp, result);
++ Tcl_DecrRefCount(result);
+ return TCL_ERROR;
+ }
+ return TCL_OK;
Added: tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch?rev=1423233&view=auto
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch (added)
+++ tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch Tue Dec 18 00:26:54 2012
@@ -0,0 +1,34 @@
+--- a/rivet/init.tcl
++++ b/rivet/init.tcl
+@@ -12,7 +12,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-package provide RivetTcl 2.1
++package provide Rivet 2.1
+
+ namespace eval ::Rivet {
+
+@@ -117,11 +117,11 @@
+ set tclpath [file join [file dirname [info script]] rivet-tcl]
+ set auto_path [linsert $auto_path 0 $tclpath]
+
+- ## As we moved the commands ensemble to ::rivet namespace we
++ ## As we moved the commands set to ::rivet namespace we
+ ## we want to guarantee the commands are still accessible
+ ## at global level by putting them on the export list.
+ ## Importing the ::rivet namespace is deprecated and we should
+- ## make it clear that this will be removed in the future
++ ## make it clear in the manual
+
+ ## we keep in ::rivet::export_list a list of importable commands
+
+@@ -190,7 +190,7 @@
+ # This option is not guaranteed to be supported in future versions.
+
+ if {[info exists module_conf(import_rivet_commands)] && $module_conf(import_rivet_commands)} {
+- namespace import -force ::rivet::*
++ namespace eval :: { namespace import -force ::rivet::* }
+ }
+
+ array unset module_conf
Modified: tcl/rivet/branches/debian-apache2.2/patches/series
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/series?rev=1423233&r1=1423232&r2=1423233&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/series (original)
+++ tcl/rivet/branches/debian-apache2.2/patches/series Tue Dec 18 00:26:54 2012
@@ -1 +1,6 @@
+session-fix-store.patch
+rivet-core-headers-subcmd.patch
+mod-rivet-rivetlib.patch
+rivet-import-fix.patch
+librivet-pkg-version.patch
doc-nohtmlremove.patch
Added: tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch?rev=1423233&view=auto
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch (added)
+++ tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch Tue Dec 18 00:26:54 2012
@@ -0,0 +1,22 @@
+--- a/rivet/packages/session/session-class.tcl
++++ b/rivet/packages/session/session-class.tcl
+@@ -1,7 +1,7 @@
+ #
+ # Session - Itcl object for web session management for Rivet
+ #
+-# $Id: session-class.tcl 1373643 2012-08-15 21:45:39Z mxmanghi $
++# $Id: session-class.tcl 1422710 2012-12-16 23:12:29Z mxmanghi $
+ #
+
+ # Copyright 2004 The Apache Software Foundation
+@@ -316,8 +316,8 @@
+ set kf [list session_id package_ key_]
+
+ if {![$dioObject store a -table $sessionCacheTable -keyfield $kf]} {
+- puts "Failed to store $sessionCacheTable '$kf'"
+- parray a
++ debug "Failed to store $sessionCacheTable '$kf'"
++ #parray a
+ error [$dioObject errorinfo]
+ }
+ }
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org