|
From: Mod C. C. L. <mod...@so...> - 2004-05-24 01:34:06
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
apache_handler.cpp mod_cplusplus.c
Log Message:
rework the cleanups so the modules are properly deleted before the kid process shuts down. Requested by William F. Dowling <wil...@th...>
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_handler.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- apache_handler.cpp 14 Aug 2003 12:14:28 -0000 1.13
+++ apache_handler.cpp 24 May 2004 01:33:54 -0000 1.14
@@ -93,6 +93,31 @@
{
CALL_REQ_FUNCTION(logger);
}
+
+ static apr_status_t delete_handler(void *data)
+ {
+ ApacheHandler *handler = (ApacheHandler *)data;
+ delete handler;
+ return APR_SUCCESS;
+ }
+ static apr_status_t delete_input_filter(void *data)
+ {
+ ApacheInputFilter *filter = (ApacheInputFilter *)data;
+ delete filter;
+ return APR_SUCCESS;
+ }
+ static apr_status_t delete_output_filter(void *data)
+ {
+ ApacheOutputFilter *filter = (ApacheOutputFilter *)data;
+ delete filter;
+ return APR_SUCCESS;
+ }
+ static apr_status_t delete_protocol_handler(void *data)
+ {
+ ApacheProtocol *protocol = (ApacheProtocol *)data;
+ delete protocol;
+ return APR_SUCCESS;
+ }
char *load_cpp_module( apr_pool_t *pool, cpp_server_rec *server_rec,
const char *name, const char *path)
@@ -137,18 +162,30 @@
ApacheProtocol *protocol = cur_handler->protocol_func ?
cur_handler->protocol_func() : NULL;
- if( handler != NULL )
+ if( handler != NULL ) {
apr_hash_set(server_rec->handler_hash,
name, strlen(name), handler);
- if( input_filter != NULL )
+ apr_pool_cleanup_register(pool, (void *)handler, delete_handler,
+ apr_pool_cleanup_null);
+ }
+ if( input_filter != NULL ) {
apr_hash_set(server_rec->input_filter_hash,
name, strlen(name), input_filter);
- if( output_filter != NULL )
+ apr_pool_cleanup_register(pool, (void *)input_filter, delete_input_filter,
+ apr_pool_cleanup_null);
+ }
+ if( output_filter != NULL ) {
apr_hash_set(server_rec->output_filter_hash,
name, strlen(name), output_filter);
- if( protocol != NULL )
+ apr_pool_cleanup_register(pool, (void *)output_filter, delete_output_filter,
+ apr_pool_cleanup_null);
+ }
+ if( protocol != NULL ) {
apr_hash_set(server_rec->protocol_hash,
name, strlen(name), protocol);
+ apr_pool_cleanup_register(pool, (void *)protocol, delete_protocol_handler,
+ apr_pool_cleanup_null);
+ }
return NULL;
}
}
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- mod_cplusplus.c 8 Jul 2002 16:59:55 -0000 1.19
+++ mod_cplusplus.c 24 May 2004 01:33:54 -0000 1.20
@@ -71,7 +71,7 @@
ap_get_module_config(cmd->server->module_config,
&cplusplus_module);
- return load_cpp_module(cmd->pool, server_rec, name, path_to_so);
+ return load_cpp_module(cmd->server->process->pool, server_rec, name, path_to_so);
}
static const char *pass_var(cmd_parms *cmd, void *config,
|
|
From: Mod C. C. L. <mod...@so...> - 2004-12-14 13:17:12
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
apache_handler.cpp mod_cplusplus.c
Log Message:
add a new parameter passing mechanism to filters that is per server, not per dir
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_handler.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- apache_handler.cpp 28 Jun 2004 02:52:32 -0000 1.15
+++ apache_handler.cpp 14 Dec 2004 13:17:04 -0000 1.16
@@ -191,6 +191,18 @@
}
}
+char *ApacheBase::get_server_var(ApacheServerRec *pServer, const char *name)
+{
+ cpp_server_rec *server_rec = NULL;
+ if( !name ) {
+ return NULL;
+ }
+ server_rec = (cpp_server_rec *)
+ pServer->get_module_config(&cplusplus_module);
+ char *value = (char *)apr_hash_get(server_rec->var_hash, name, strlen(name));
+ return value;
+}
+
char *ApacheBase::get_cpp_var(ApacheRequestRec *pRequest, const char *name)
{
cpp_config_rec *dir_rec = (cpp_config_rec *)
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- mod_cplusplus.c 24 May 2004 01:33:54 -0000 1.20
+++ mod_cplusplus.c 14 Dec 2004 13:17:04 -0000 1.21
@@ -52,6 +52,7 @@
cpp_server_rec *new_config = (cpp_server_rec *)
apr_pcalloc(p, sizeof(*new_config));
new_config->handler_hash = apr_hash_make(p);
+ new_config->var_hash = apr_hash_make(p);
new_config->input_filter_hash = apr_hash_make(p);
new_config->output_filter_hash = apr_hash_make(p);
new_config->protocol_hash = apr_hash_make(p);
@@ -74,6 +75,17 @@
return load_cpp_module(cmd->server->process->pool, server_rec, name, path_to_so);
}
+static const char *pass_server_var(cmd_parms *cmd, void *config,
+ const char *name,
+ const char *value)
+{
+ cpp_server_rec *server_rec = (cpp_server_rec *)
+ ap_get_module_config(cmd->server->module_config,
+ &cplusplus_module);
+ apr_hash_set(server_rec->var_hash, name, strlen(name), value);
+ return NULL;
+}
+
static const char *pass_var(cmd_parms *cmd, void *config,
const char *name,
const char *value)
@@ -232,7 +244,9 @@
RSRC_CONF,
"add protocol handler"),
AP_INIT_TAKE2("PassCPPVar", pass_var, NULL, OR_FILEINFO,
- "pass var to cpp handlers"),
+ "pass var to cpp handlers via request config (per dir)"),
+ AP_INIT_TAKE2("PassCPPServerVar", pass_server_var, NULL, RSRC_CONF,
+ "pass var to cpp handlers via server config"),
{NULL}
};
|
|
From: Mod C. C. L. <mod...@so...> - 2006-01-21 21:46:12
|
Mod Cplusplus CVS committal
Author : johnksterling
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
apache_handler.cpp mod_cplusplus.c
Log Message:
add support for passing server rec to the constructors. This allow the contructors to initialize things instead of the past technique of lazy initializing. This change will not be backward compatibile - so existing modules will need to be upgraded
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/apache_handler.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- apache_handler.cpp 7 Aug 2005 20:24:50 -0000 1.17
+++ apache_handler.cpp 21 Jan 2006 21:45:36 -0000 1.18
@@ -120,12 +120,12 @@
return APR_SUCCESS;
}
- char *load_cpp_module( apr_pool_t *pool, cpp_server_rec *server_rec,
+ char *load_cpp_module( apr_pool_t *pool, server_rec *server, cpp_server_rec *server_rec,
const char *name, const char *path)
{
apr_dso_handle_t *sohandle;
apr_dso_handle_sym_t sosymbol;
-
+ ApacheServerRec *pServer = new ApacheServerRec(server);
cpp_factory_t *cur_handler;
if ( apr_dso_load(&sohandle, path, pool) != APR_SUCCESS ) {
char my_error[256];
@@ -155,13 +155,13 @@
cur_handler = (cpp_factory_t *) sosymbol;
ApacheHandler *handler = cur_handler->handler_func ?
- cur_handler->handler_func() : NULL;
+ cur_handler->handler_func(pServer) : NULL;
ApacheInputFilter *input_filter = cur_handler->input_filter_func ?
- cur_handler->input_filter_func() : NULL;
+ cur_handler->input_filter_func(pServer) : NULL;
ApacheOutputFilter *output_filter = cur_handler->output_filter_func ?
- cur_handler->output_filter_func() : NULL;
+ cur_handler->output_filter_func(pServer) : NULL;
ApacheProtocol *protocol = cur_handler->protocol_func ?
- cur_handler->protocol_func() : NULL;
+ cur_handler->protocol_func(pServer) : NULL;
if( handler != NULL ) {
apr_hash_set(server_rec->handler_hash,
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- mod_cplusplus.c 14 Dec 2004 13:17:04 -0000 1.21
+++ mod_cplusplus.c 21 Jan 2006 21:45:36 -0000 1.22
@@ -72,7 +72,7 @@
ap_get_module_config(cmd->server->module_config,
&cplusplus_module);
- return load_cpp_module(cmd->server->process->pool, server_rec, name, path_to_so);
+ return load_cpp_module(cmd->server->process->pool, cmd->server, server_rec, name, path_to_so);
}
static const char *pass_server_var(cmd_parms *cmd, void *config,
|
