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 2017/04/07 09:47:27 UTC
svn commit: r1790530 - in /tcl/rivet/trunk: ChangeLog doc/xml/internals.xml
src/mod_rivet_ng/rivet_lazy_mpm.c
Author: mxmanghi
Date: Fri Apr 7 09:47:27 2017
New Revision: 1790530
URL: http://svn.apache.org/viewvc?rev=1790530&view=rev
Log:
2017-04-06 Massimo Manghi <mx...@apache.org>
* src/mod_rivet_ng/rivet_lazy_mpm.c: server_rec
argument in error logging changed to global
root server. Passing the virtual host server rec
makes the call to ap_log_error quiet and
if something goes wrong in the thread's Tcl interp
initialization we don't read anything!
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/doc/xml/internals.xml
tcl/rivet/trunk/src/mod_rivet_ng/rivet_lazy_mpm.c
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1790530&r1=1790529&r2=1790530&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Fri Apr 7 09:47:27 2017
@@ -1,3 +1,11 @@
+2017-04-06 Massimo Manghi <mx...@apache.org>
+ * src/mod_rivet_ng/rivet_lazy_mpm.c: server_rec
+ argument in error logging changed to global
+ root server. Passing the virtual host server rec
+ makes the call to ap_log_error quiet and
+ if something goes wrong in the thread's Tcl interp
+ initialization we don't read anything!
+
2017-04-05 Massimo Manghi <mx...@apache.org>
* doc/xml/formbroker.xml: better wording of a few
concepts. Add documentation for the boolean data type
Modified: tcl/rivet/trunk/doc/xml/internals.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/internals.xml?rev=1790530&r1=1790529&r2=1790530&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/internals.xml (original)
+++ tcl/rivet/trunk/doc/xml/internals.xml Fri Apr 7 09:47:27 2017
@@ -142,9 +142,11 @@
</listitem>
<listitem>
<emphasis>mpm_thread_interp</emphasis> must be a function returning
- the interpreter object (a pointer to record of type <command>rivet_thread_interp</command>) associated
- to a given configuration as stored in a <command>rivet_server_conf*</command> object. This element
- was temporarily introduced in the <command>mpm_bridge_table</command> table and should be accessed
+ the interpreter object (a pointer to record of type
+ <command>rivet_thread_interp</command>) associated
+ to a given configuration as stored in a <command>rivet_server_conf*</command>
+ object. This element was temporarily introduced in the
+ <command>mpm_bridge_table</command> table and should be accessed
through the macro RIVET_PEEK_INTERP.
<programlisting>interp_obj = RIVET_PEEK_INTERP(private,private->conf);</programlisting>
Every bridge implementation should have its own way to store interpreter data and manage their
@@ -278,7 +280,7 @@
check for the validity of the pointer using the macro
CHECK_REQUEST_REC(private,"::rivet::<cmd_name>")
- <programlisting>TCL_CMD_HEADER( Rivet_MyCmd )
+ <programlisting>TCL_CMD_HEADER(Rivet_MyCmd)
{
/* we have to get the thread private data */
@@ -290,7 +292,7 @@
*/
CHECK_REQUEST_REC(private,"::rivet::mycmd");
- ...
+ ....
}</programlisting>
In <command>Rivet_InitCore</command> define the new command and its handler
<programlisting>RIVET_OBJ_CMD ("mycmd",Rivet_MyCmd,private);</programlisting>
Modified: tcl/rivet/trunk/src/mod_rivet_ng/rivet_lazy_mpm.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/mod_rivet_ng/rivet_lazy_mpm.c?rev=1790530&r1=1790529&r2=1790530&view=diff
==============================================================================
--- tcl/rivet/trunk/src/mod_rivet_ng/rivet_lazy_mpm.c (original)
+++ tcl/rivet/trunk/src/mod_rivet_ng/rivet_lazy_mpm.c Fri Apr 7 09:47:27 2017
@@ -103,7 +103,6 @@ enum {
static void Lazy_RunConfScript (rivet_thread_private* private,lazy_tcl_worker* w,int init)
{
- char* errmsg = "rivet_lazy_mpm.so: Error in configuration script: %s";
Tcl_Obj* tcl_conf_script;
Tcl_Interp* interp = private->ext->interp->interp;
void* function = NULL;
@@ -124,11 +123,14 @@ static void Lazy_RunConfScript (rivet_th
if (Tcl_EvalObjEx(interp,tcl_conf_script, 0) != TCL_OK)
{
- ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL,w->server,
+ char* errmsg = "rivet_lazy_mpm.so: Error in configuration script: %s";
+ server_rec* root_server = module_globals->server;
+
+ ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL,root_server,
errmsg, function);
- ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL,w->server,
+ ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL,root_server,
"errorCode: %s", Tcl_GetVar(interp, "errorCode", 0));
- ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL,w->server,
+ ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL,root_server,
"errorInfo: %s", Tcl_GetVar(interp, "errorInfo", 0));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org