You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2010/06/19 23:21:46 UTC
svn commit: r956298 - in /tcl/rivet/trunk: ChangeLog
src/apache-2/mod_rivet.c src/apache-2/mod_rivet.h
Author: mxmanghi
Date: Sat Jun 19 21:21:45 2010
New Revision: 956298
URL: http://svn.apache.org/viewvc?rev=956298&view=rev
Log:
2010-06-19 Massimo Manghi <mx...@apache.org>
* src/apache-2/mod_rivet.c: filled SERVER_CONF variable in the 'server' array with value generated
by the build system of the directory holding the conf files.
This fulfills a TODO comment in the code. The array server is undocumented and is not clear if it was
added for the benefit of the programmer or for debugging of the module.
* src/apache-2/mod_rivet.h: structure definitions beautified and aligned.
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/src/apache-2/mod_rivet.c
tcl/rivet/trunk/src/apache-2/mod_rivet.h
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=956298&r1=956297&r2=956298&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Sat Jun 19 21:21:45 2010
@@ -1,3 +1,10 @@
+2010-06-19 Massimo Manghi <mx...@apache.org>
+ * src/apache-2/mod_rivet.c: filled SERVER_CONF variable in the 'server' array with value generated
+ by the build system of the directory holding the conf files.
+ This fulfills a TODO comment in the code. The array server is undocumented and is not clear if it was
+ added for the benefit of the programmer or for debugging of the module.
+ * src/apache-2/mod_rivet.h: structure definitions beautified and aligned.
+
2010-05-14 Massimo Manghi <mx...@apache.org>
* BUGS,INSTALL,Changelog: small improvements in the documentation
Modified: tcl/rivet/trunk/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/mod_rivet.c?rev=956298&r1=956297&r2=956298&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/trunk/src/apache-2/mod_rivet.c Sat Jun 19 21:21:45 2010
@@ -58,9 +58,9 @@
//module AP_MODULE_DECLARE_DATA rivet_module;
/* This is used *only* in the PanicProc. Otherwise, don't touch it! */
-static request_rec *rivet_panic_request_rec = NULL;
-static apr_pool_t *rivet_panic_pool = NULL;
-static server_rec *rivet_panic_server_rec = NULL;
+static request_rec *rivet_panic_request_rec = NULL;
+static apr_pool_t *rivet_panic_pool = NULL;
+static server_rec *rivet_panic_server_rec = NULL;
/* Need some arbitrary non-NULL pointer which can't also be a request_rec */
#define NESTED_INCLUDE_MAGIC (&rivet_module)
@@ -233,9 +233,7 @@ Rivet_InitServerVariables( Tcl_Interp *i
TCL_GLOBAL_ONLY);
Tcl_DecrRefCount(obj);
- //obj = Tcl_NewStringObj(ap_server_root_relative(p, ap_server_confname), -1);
- //TODO: fix server conf name
- obj = Tcl_NewStringObj ("serverconfname", -1);
+ obj = Tcl_NewStringObj(ap_server_root_relative(p,SERVER_CONFIG_FILE), -1);
Tcl_IncrRefCount(obj);
Tcl_SetVar2Ex(interp,
"server",
Modified: tcl/rivet/trunk/src/apache-2/mod_rivet.h
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/mod_rivet.h?rev=956298&r1=956297&r2=956298&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/mod_rivet.h (original)
+++ tcl/rivet/trunk/src/apache-2/mod_rivet.h Sat Jun 19 21:21:45 2010
@@ -51,43 +51,42 @@
module AP_MODULE_DECLARE_DATA rivet_module;
typedef struct _rivet_server_conf {
- Tcl_Interp *server_interp; /* per server Tcl interpreter */
- Tcl_Obj *rivet_global_init_script; /* run once when apache is started */
+ Tcl_Interp *server_interp; /* per server Tcl interpreter */
+ Tcl_Obj *rivet_global_init_script; /* run once when apache is started */
Tcl_Obj *rivet_child_init_script;
Tcl_Obj *rivet_child_exit_script;
- char *rivet_before_script; /* script run before each page */
- char *rivet_after_script; /* after */
- char *rivet_error_script; /* for errors */
+ char *rivet_before_script; /* script run before each page */
+ char *rivet_after_script; /* after */
+ char *rivet_error_script; /* for errors */
/* This flag is used with the above directives. If any of them
have changed, it gets set. */
int user_scripts_updated;
- Tcl_Obj *rivet_default_error_script; /* for errors */
+ Tcl_Obj *rivet_default_error_script; /* for errors */
int *cache_size;
int *cache_free;
int upload_max;
int upload_files_to_var;
int separate_virtual_interps;
- int honor_header_only_reqs; /* default: 0 */
+ int honor_header_only_reqs; /* default: 0 */
char *server_name;
const char *upload_dir;
apr_table_t *rivet_server_vars;
apr_table_t *rivet_dir_vars;
apr_table_t *rivet_user_vars;
- char **objCacheList; /* Array of cached objects (for priority handling) */
- Tcl_HashTable *objCache; /* Objects cache - the key is the script name */
+ char **objCacheList; /* Array of cached objects (for priority handling) */
+ Tcl_HashTable *objCache; /* Objects cache - the key is the script name */
- /* stuff for buffering output */
- Tcl_Channel *outchannel;
+ Tcl_Channel *outchannel; /* stuff for buffering output */
} rivet_server_conf;
/* eventually we will transfer 'global' variables in here and
'de-globalize' them */
typedef struct _rivet_interp_globals {
- request_rec *r; /* request rec */
- TclWebRequest *req; /* TclWeb API request */
+ request_rec *r; /* request rec */
+ TclWebRequest *req; /* TclWeb API request */
} rivet_interp_globals;
int Rivet_ParseExecFile(TclWebRequest *req, char *filename, int toplevel);
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org