You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by mx...@apache.org on 2022/02/19 10:41:12 UTC
[tcl-rivet] branch quattuor updated (b04d66e -> da72103)
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a change to branch quattuor
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git.
from b04d66e document latest feature added
new c174539 removed trailing spaces
new 3b5c01a merging latest commit in trunk
new da72103 rephrasing comments and fix URL in documentation
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog | 5 +++++
doc/rivet.css | 4 ++--
doc/rivet.xml | 1 -
doc/xml/internals.xml | 2 +-
src/mod_rivet_ng/mod_rivet.c | 46 ++++++++++++++++++++++----------------------
src/mod_rivet_ng/rivetCore.c | 10 +++++-----
6 files changed, 36 insertions(+), 32 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org
[tcl-rivet] 01/03: removed trailing spaces
Posted by mx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch quattuor
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit c17453950c46d7b72f3773dbd993f87d8dfed8b9
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Fri Jan 3 16:03:01 2020 +0100
removed trailing spaces
---
src/mod_rivet_ng/mod_rivet.c | 55 ++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/mod_rivet_ng/mod_rivet.c b/src/mod_rivet_ng/mod_rivet.c
index 36df39f..c81e01a 100644
--- a/src/mod_rivet_ng/mod_rivet.c
+++ b/src/mod_rivet_ng/mod_rivet.c
@@ -77,26 +77,26 @@ DLLEXPORT module rivet_module;
#define TCL_HANDLER_FILE RIVET_DIR"/default_request_handler.tcl"
/*
-* -- Rivet_SeekMPMBridge
+* -- Rivet_SeekMPMBridge
*
* Determing the bridge name to be loaded following these steps
*
* * The RIVET_MPM_BRIDGE environment variable is checked and if
-* existing its definition is taken to be the path to the bridge
+* existing its definition is taken to be the path to the bridge
* module
*
-* * The configuration is checked to see if an mpm_bridge line
+* * The configuration is checked to see if an mpm_bridge line
* defined exists (as sepecified with the configuration MpmBridge
* directive) and if defined:
-*
+*
* - the string is interpolated with RIVET_MPM_BRIDGE_COMPOSE
-* - if the former step fails the string is
+* - if the former step fails the string is
* interpreted as a full path to a bridge module
*
* * if MpmBridge was not defined the code adopt an heuristics based
-* on the response from the call to ap_mpm_query. If
+* on the response from the call to ap_mpm_query. If
* the MPM is not threaded we load the prefork bridge
-*
+*
* * If everything fails the worker bridge is loaded
*/
@@ -177,7 +177,7 @@ Rivet_SeekMPMBridge (apr_pool_t* pool,server_rec* server)
* -- Rivet_CreateModuleGlobals
*
* module globals (mod_rivet_globals) allocation and initialization
-*
+*
*/
static mod_rivet_globals*
@@ -220,7 +220,7 @@ Rivet_CreateModuleGlobals (apr_pool_t* pool, server_rec* server)
/*
* -- Rivet_Exit_Handler
*
-*
+*
*
*/
@@ -235,7 +235,7 @@ int Rivet_Exit_Handler(int code)
* -- Rivet_RunServerInit
*
* Server initialization
-*
+*
*/
static int
@@ -277,8 +277,8 @@ Rivet_RunServerInit (apr_pool_t *pPool, apr_pool_t *pLog, apr_pool_t *pTemp, ser
* (https://wiki.apache.org/httpd/ModuleLife)
*/
- /*
- * if the environment variable AP_PARENT_PID is set
+ /*
+ * if the environment variable AP_PARENT_PID is set
* we know we are in a child process of the winnt MPM
*/
{
@@ -314,21 +314,21 @@ Rivet_RunServerInit (apr_pool_t *pPool, apr_pool_t *pLog, apr_pool_t *pTemp, ser
vhost_rsc = RIVET_SERVER_CONF(s->module_config);
- if (vhost_rsc->rivet_server_init_script != NULL)
+ if (vhost_rsc->rivet_server_init_script != NULL)
{
Tcl_Obj* server_init;
- /* either we want separate virtual interps or we haven't
+ /* either we want separate virtual interps or we haven't
* created an interpreter so far we create one
*/
- if ((interp_obj == NULL) || vhost_rsc->separate_virtual_interps)
+ if ((interp_obj == NULL) || vhost_rsc->separate_virtual_interps)
{
interp_obj = Rivet_NewVHostInterp(private,s);
- /* We initialize the interpreter and we won't
+ /* We initialize the interpreter and we won't
* register a channel with it because
- * we couldn't send data to the stdout anyway
+ * we couldn't send data to the stdout anyway
*/
Rivet_PerInterpInit(interp_obj,private,s,pPool);
@@ -340,8 +340,7 @@ Rivet_RunServerInit (apr_pool_t *pPool, apr_pool_t *pLog, apr_pool_t *pTemp, ser
} else {
- interp_obj =
- Rivet_DuplicateVHostInterp(pPool,root_interp);
+ interp_obj = Rivet_DuplicateVHostInterp(pPool,root_interp);
}
@@ -350,13 +349,13 @@ Rivet_RunServerInit (apr_pool_t *pPool, apr_pool_t *pLog, apr_pool_t *pTemp, ser
*/
module_globals->server_interps[vhost_rsc->idx] = interp_obj;
-
+
/* we now establish the full rivet core command set for the root interpreter */
// Rivet_InitCore (module_globals->server_interps[vhost_rsc->idx],private);
/* We don't create the cache here: it would make sense only
* for the prefork MPM. Non-fork bridges should do it
- * themselves
+ * themselves
*/
server_init = Tcl_NewStringObj(vhost_rsc->rivet_server_init_script,-1);
@@ -367,15 +366,15 @@ Rivet_RunServerInit (apr_pool_t *pPool, apr_pool_t *pLog, apr_pool_t *pTemp, ser
}
}
-
+
/* bridge specific server init script */
-
+
RIVET_MPM_BRIDGE_CALL(server_init,pPool,pLog,pTemp,server);
return OK;
}
-/*
+/*
* -- Rivet_ServerInit
*
* Post config hook. The server initialization loads the MPM bridge
@@ -396,7 +395,7 @@ Rivet_ServerInit (apr_pool_t *pPool, apr_pool_t *pLog, apr_pool_t *pTemp, server
ap_add_version_component(pPool,RIVET_PACKAGE_NAME);
#endif
- /* This function runs as post_config_hook and as such it's run twice
+ /* This function runs as post_config_hook and as such it's run twice
* by design. This is the recommended way to avoid a double load of
* external modules.
*/
@@ -412,8 +411,8 @@ Rivet_ServerInit (apr_pool_t *pPool, apr_pool_t *pLog, apr_pool_t *pTemp, server
return OK; /* This would be the first time through */
}
-
- /* Everything revolves around this structure: module_globals. The structure
+
+ /* Everything revolves around this structure: module_globals. The structure
* is allocated and the MPM bridge name is established */
module_globals = Rivet_CreateModuleGlobals (pPool,server);
@@ -524,7 +523,7 @@ static void Rivet_ChildInit (apr_pool_t *pChild, server_rec *server)
* was called. We really need a separate one for each server,
* so we go ahead and create one here, if necessary. */
- if (s != server && myrsc == root_server_conf)
+ if (s != server && myrsc == root_server_conf)
{
myrsc = RIVET_NEW_CONF(pChild);
ap_set_module_config(s->module_config, &rivet_module, myrsc);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org
[tcl-rivet] 02/03: merging latest commit in trunk
Posted by mx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch quattuor
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit 3b5c01a686ffbbe6ad4ee2b7f25468c43e1a92b5
Merge: c174539 b04d66e
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Tue Feb 15 10:56:54 2022 +0100
merging latest commit in trunk
.appveyor.yml | 39 +
.gitignore | 1 +
ChangeLog | 191 ++-
configure.ac | 41 +-
doc/xml/commands.xml | 204 ++--
doc/xml/dio.xml | 20 +-
doc/xml/directives.xml | 103 +-
doc/xml/form.xml | 18 +-
doc/xml/installation.xml | 12 +-
doc/xml/lazybridge.xml | 79 +-
rivet/packages/dio/dio.tcl | 8 +-
rivet/packages/dio/dio_Mysql.tcl | 35 +-
rivet/packages/form/form.tcl | 2 -
rivet/packages/form/form2.tcl | 35 +-
rivet/packages/form/{form2.tcl => form22.tcl} | 24 +-
rivet/packages/formbroker/formbroker.tcl | 59 +-
rivet/packages/session/session-class.tcl | 3 +-
rivet/packages/session/session-create-mysql.sql | 6 +-
rivet/packages/session/session-create-oracle.sql | 12 +-
rivet/packages/session/session-create-sqlite.sql | 6 +-
src/TclWeb.h | 37 +-
src/mod_rivet_ng/TclWebapache.c | 586 ++++++---
src/mod_rivet_ng/apache_config.c | 37 +-
src/mod_rivet_ng/mod_rivet.c | 167 ++-
src/mod_rivet_ng/mod_rivet.h | 127 +-
src/mod_rivet_ng/mod_rivet_cache.c | 76 +-
src/mod_rivet_ng/mod_rivet_cache.h | 6 +-
src/mod_rivet_ng/mod_rivet_common.c | 132 +-
src/mod_rivet_ng/mod_rivet_common.h | 4 +-
src/mod_rivet_ng/mod_rivet_generator.c | 2 +-
src/mod_rivet_ng/rivetCore.c | 404 +++++--
src/mod_rivet_ng/rivetInspect.c | 153 ++-
src/mod_rivet_ng/rivet_lazy_mpm.c | 199 +--
src/mod_rivet_ng/rivet_prefork_mpm.c | 49 +-
src/mod_rivet_ng/rivet_types.h | 2 +-
src/mod_rivet_ng/rivet_worker_mpm.c | 73 +-
src/mod_rivet_ng/worker_prefork_common.c | 17 +-
src/rivet.h | 15 +-
tclconfig/install-sh | 399 +++---
tclconfig/tcl.m4 | 1411 +++++++++++-----------
tests/apachetest/apachetest.tcl | 70 +-
tests/apachetest/template.conf.1.tcl | 2 +-
tests/apachetest/template.conf.2.tcl | 1 -
tests/env.rvt | 22 +-
tests/env.test | 49 +-
tests/env_methods.tcl | 15 +
tests/headers.test | 5 +-
tests/rivet.test | 19 +-
tests/runtests.tcl | 91 +-
49 files changed, 2994 insertions(+), 2074 deletions(-)
diff --cc src/mod_rivet_ng/mod_rivet.c
index c81e01a,19070e5..d7e3331
--- a/src/mod_rivet_ng/mod_rivet.c
+++ b/src/mod_rivet_ng/mod_rivet.c
@@@ -322,13 -327,13 +327,13 @@@ Rivet_RunServerInit (apr_pool_t *pPool
* created an interpreter so far we create one
*/
- if ((interp_obj == NULL) || vhost_rsc->separate_virtual_interps)
+ if ((interp_obj == NULL) || module_globals->separate_virtual_interps)
{
- interp_obj = Rivet_NewVHostInterp(private,s);
+ interp_obj = Rivet_NewVHostInterp(private,vhost_rsc->default_cache_size);
- /* We initialize the interpreter and we won't
+ /* We initialize the interpreter and we won't
* register a channel with it because
- * we couldn't send data to the stdout anyway
+ * we couldn't send data to the stdout anyway
*/
Rivet_PerInterpInit(interp_obj,private,s,pPool);
@@@ -523,11 -550,10 +549,11 @@@ static void Rivet_ChildInit (apr_pool_
* was called. We really need a separate one for each server,
* so we go ahead and create one here, if necessary. */
- if (s != server && myrsc == root_server_conf) {
+ if (s != server && myrsc == root_server_conf)
+ {
myrsc = RIVET_NEW_CONF(pChild);
ap_set_module_config(s->module_config, &rivet_module, myrsc);
- Rivet_CopyConfig(root_server_conf,myrsc);
+ Rivet_CopyConfig( root_server_conf, myrsc );
}
myrsc->idx = idx++;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org
[tcl-rivet] 03/03: rephrasing comments and fix URL in documentation
Posted by mx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch quattuor
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit da7210336c60a24e1341cba047c5bab3052b3675
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Sat Feb 19 11:40:49 2022 +0100
rephrasing comments and fix URL in documentation
---
ChangeLog | 5 +++++
doc/rivet.css | 4 ++--
doc/xml/internals.xml | 2 +-
src/mod_rivet_ng/rivetCore.c | 10 +++++-----
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 866aba6..b049f76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-02-19 Massimo Manghi <mx...@apache.org>
+ * src/mod_rivet_ng/rivetCore.c: rephrasing comment
+ * doc/xml/internals.xml: fix URL to git repository (it still was pointing to SVN)
+ * doc/rivet.css: removing trailing spaces
+
2022-02-14 Massimo Manghi <mx...@apache.org>
* src/mod_rivet_ng/rivetCore.c: New feature of the '::rivet::var all' commands.
An extra optional argument is interpreted as a dictionary of default values
diff --git a/doc/rivet.css b/doc/rivet.css
index 71ae239..6a9e47b 100644
--- a/doc/rivet.css
+++ b/doc/rivet.css
@@ -340,7 +340,7 @@ table.namespaces {
}
.namespaces tr.init {
- background-color: #bb8766;
+ background-color: #bb8766;
}
.namespaces tr.childinit {
@@ -348,7 +348,7 @@ table.namespaces {
}
.namespaces tr.processing {
- background-color: #bb8766;
+ background-color: #bb8766;
}
.namespaces tr.childexit {
diff --git a/doc/xml/internals.xml b/doc/xml/internals.xml
index d5cd7a3..8b70b43 100644
--- a/doc/xml/internals.xml
+++ b/doc/xml/internals.xml
@@ -138,7 +138,7 @@
the <emphasis>worker</emphasis> MPM bridge the finalize function
is called after the current thread itself is set up for termination.
See function Rivet_ExitCmd in
- <ulink url="https://svn.apache.org/repos/asf/tcl/rivet/trunk/src/mod_rivet_ng/rivetCore.c">rivetCore.c</ulink>
+ <ulink url="https://gitbox.apache.org/repos/asf?p=tcl-rivet.git;a=blob;f=src/mod_rivet_ng/rivetCore.c">rivetCore.c</ulink>
to have details on how and at what stage this callback is invoked.
</listitem>
<listitem>
diff --git a/src/mod_rivet_ng/rivetCore.c b/src/mod_rivet_ng/rivetCore.c
index 251fb22..3b1295c 100644
--- a/src/mod_rivet_ng/rivetCore.c
+++ b/src/mod_rivet_ng/rivetCore.c
@@ -794,16 +794,15 @@ TCL_CMD_HEADER ( Rivet_Var )
*/
if (Tcl_DictObjFirst(interp,objv[2],&search,&key,&value,&done) != TCL_OK) {
- /* If the object passed as optional argument is a valid dictionary it
- * shouldn't never get here
- */
+ /* If the object passed as optional argument is
+ * a valid dictionary we shouldn't get here */
Tcl_SetStringObj(result,"invalid_dictionary_value",-1);
/* We use the result Tcl_Obj to assign an error code. This should also release the object memory */
Tcl_SetObjErrorCode(interp,result);
- Tcl_AddObjErrorInfo(interp,"Impossible to interpret the default values argument as a dictionary value",-1);
+ Tcl_AddObjErrorInfo(interp,"Impossible to interpret the optional defaults argument as a dictionary value",-1);
return TCL_ERROR;
}
@@ -823,13 +822,14 @@ TCL_CMD_HEADER ( Rivet_Var )
}
} else {
+
/* bad command */
Tcl_AppendResult(interp,"bad option: must be one of ",
"'get, list, names, number, all'", NULL);
return TCL_ERROR;
+
}
Tcl_SetObjResult(interp, result);
-
return TCL_OK;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org