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 2015/02/05 10:08:50 UTC
svn commit: r1657499 - in /tcl/rivet/branches/2.2: ChangeLog
src/apache-2/mod_rivet.c src/config/TclWebapache.c
Author: mxmanghi
Date: Thu Feb 5 09:08:50 2015
New Revision: 1657499
URL: http://svn.apache.org/r1657499
Log:
* src/apache-2/mod_rivet.c: moving execution of after_every_script before request
cleanup (still a null procedure, but just in case we give it something to do)
Modified:
tcl/rivet/branches/2.2/ChangeLog
tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c
tcl/rivet/branches/2.2/src/config/TclWebapache.c
Modified: tcl/rivet/branches/2.2/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/ChangeLog?rev=1657499&r1=1657498&r2=1657499&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/ChangeLog (original)
+++ tcl/rivet/branches/2.2/ChangeLog Thu Feb 5 09:08:50 2015
@@ -1,14 +1,18 @@
+2015-02-06 Massimo Manghi <mx...@apache.org>
+ * src/apache-2/mod_rivet.c: moving execution of after_every_script before request
+ cleanup (still a null procedure, but just in case we give it something to do)
+
2015-02-02 Massimo Manghi <mx...@apache.org>
* src/rivetcmds/rivetCore.c: in Rivet_Parse returned value of
Rivet_ParseExecFile is propagated up to the caller. Probably unnecessary
now, but just in case we want to have special handling of TCL_CONTINUE or
- TCL_BREAK
+ TCL_BREAK (bug #57501)
* src/apache-2/mod_rivet.c: moving call to after_every_script out
of Rivet_ParseExecFile and into Rivet_SendContent. Any call to
- ::rivet::abort_page is now trapped by abort_script
+ ::rivet::abort_page is now trapped by abort_script (bug #57501)
* src/config/TclWebapache.c: if charset is set in the configuration
then it's set in the headers just before HTTP headers are sent (moved
- from mod_rivet.c
+ from mod_rivet.c)
2015-01-12 Massimo Manghi <mx...@apache.org>
* tests/redirect.test,channel.test: adding tests for new features of Rivet 2.2.1
Modified: tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c?rev=1657499&r1=1657498&r2=1657499&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c Thu Feb 5 09:08:50 2015
@@ -1482,6 +1482,18 @@ Rivet_SendContent(request_rec *r)
Tcl_GetVar(interp, "errorInfo", 0));
}
+ /* We execute also the AfterEveryScript if one was set */
+
+ if (rsc->after_every_script)
+ {
+ if (Rivet_ExecuteAndCheck(interp, rsc->after_every_script,r) == TCL_ERROR)
+ {
+ CONST84 char *errorinfo = Tcl_GetVar( interp, "errorInfo", 0 );
+ TclWeb_PrintError("<b>Rivet AfterEveryScript failed!</b>",1,globals->req);
+ TclWeb_PrintError( errorinfo, 0, globals->req );
+ }
+ }
+
if (request_cleanup == NULL) {
request_cleanup = Tcl_NewStringObj("::Rivet::cleanup_request\n", -1);
Tcl_IncrRefCount(request_cleanup);
@@ -1493,17 +1505,6 @@ Rivet_SendContent(request_rec *r)
Tcl_GetVar(interp, "errorInfo", 0));
}
- /* We execute also the AfterEveryScript if one was set */
-
- if (rsc->after_every_script) {
- if (Tcl_EvalObjEx(interp,rsc->after_every_script,0) == TCL_ERROR)
- {
- CONST84 char *errorinfo = Tcl_GetVar( interp, "errorInfo", 0 );
- TclWeb_PrintError("<b>Rivet AfterEveryScript failed!</b>",1,globals->req);
- TclWeb_PrintError( errorinfo, 0, globals->req );
- }
- }
-
/* Reset globals */
Rivet_CleanupRequest(r);
Modified: tcl/rivet/branches/2.2/src/config/TclWebapache.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/src/config/TclWebapache.c?rev=1657499&r1=1657498&r2=1657499&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/src/config/TclWebapache.c (original)
+++ tcl/rivet/branches/2.2/src/config/TclWebapache.c Thu Feb 5 09:08:50 2015
@@ -151,6 +151,12 @@ TclWeb_PrintHeaders(TclWebRequest *req)
/* Let's set the charset in the headers if one was set in the configuration */
+ if (!req->headers_set && (req->charset != NULL)) {
+ TclWeb_SetHeaderType(apr_pstrcat(req->req->pool,"text/html;",req->charset,NULL),req);
+ }
+
+ /* Let's set the charset in the headers if one was set in the configuration */
+
if (!req->headers_set && (req->charset != NULL))
{
TclWeb_SetHeaderType(apr_pstrcat(req->req->pool,"text/html;",req->charset,NULL),req);
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org