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:14 UTC
[tcl-rivet] 02/03: merging latest commit in trunk
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