Thread: [Modcplusplus-devel] (gr84b8) mod_cplusplus/src mod_cplusplus.c
Brought to you by:
gr84b8,
johnksterling
|
From: Mod C. C. L. <mod...@so...> - 2002-03-29 23:12:59
|
Mod Cplusplus CVS committal
Author : gr84b8
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
mod_cplusplus.c
Log Message:
update to synch up with filter changes
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- mod_cplusplus.c 4 Jun 2001 00:40:35 -0000 1.14
+++ mod_cplusplus.c 29 Mar 2002 23:12:58 -0000 1.15
@@ -145,7 +145,7 @@
}
}
*cur_ptr = name;
- ap_register_input_filter(name, cpp_call_input_filter, AP_FTYPE_CONTENT);
+ ap_register_input_filter(name, cpp_call_input_filter, AP_FTYPE_CONNECTION);
return NULL;
}
@@ -165,7 +165,7 @@
}
}
*cur_ptr = name;
- ap_register_output_filter(name, cpp_call_output_filter, AP_FTYPE_CONTENT);
+ ap_register_output_filter(name, cpp_call_output_filter, AP_FTYPE_CONNECTION);
return NULL;
}
@@ -184,7 +184,7 @@
}
}
*cur_ptr = name;
- ap_register_input_filter(name, cpp_call_input_filter, AP_FTYPE_CONTENT);
+ ap_register_input_filter(name, cpp_call_input_filter, AP_FTYPE_RESOURCE);
return NULL;
}
@@ -202,7 +202,7 @@
}
}
*cur_ptr = name;
- ap_register_output_filter(name, cpp_call_output_filter, AP_FTYPE_CONTENT);
+ ap_register_output_filter(name, cpp_call_output_filter, AP_FTYPE_RESOURCE);
return NULL;
}
|
|
From: Mod C. C. L. <mod...@so...> - 2002-07-08 16:51:58
|
Mod Cplusplus CVS committal
Author : gr84b8
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
mod_cplusplus.c
Log Message:
update to match the HEAD apache filter registration api
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- mod_cplusplus.c 19 Jun 2002 14:11:07 -0000 1.17
+++ mod_cplusplus.c 8 Jul 2002 16:51:56 -0000 1.18
@@ -137,7 +137,10 @@
}
}
*cur_ptr = name;
- ap_register_input_filter(name, cpp_call_input_filter, AP_FTYPE_CONNECTION);
+ ap_register_input_filter(name,
+ cpp_call_input_filter,
+ NULL,
+ AP_FTYPE_CONNECTION);
return NULL;
}
@@ -157,8 +160,11 @@
}
}
*cur_ptr = name;
- ap_register_output_filter(name, cpp_call_output_filter, AP_FTYPE_CONNECTION);
- return NULL;
+ ap_register_output_filter(name,
+ cpp_call_output_filter,
+ NULL,
+ AP_FTYPE_CONNECTION);
+ return NULL;
}
static const char *add_dir_input_filter(cmd_parms *cmd, void *config,
@@ -176,7 +182,10 @@
}
}
*cur_ptr = name;
- ap_register_input_filter(name, cpp_call_input_filter, AP_FTYPE_RESOURCE);
+ ap_register_input_filter(name,
+ cpp_call_input_filter,
+ NULL,
+ AP_FTYPE_RESOURCE);
return NULL;
}
@@ -194,7 +203,10 @@
}
}
*cur_ptr = name;
- ap_register_output_filter(name, cpp_call_output_filter, AP_FTYPE_RESOURCE);
+ ap_register_output_filter(name,
+ cpp_call_output_filter,
+ NULL,
+ AP_FTYPE_RESOURCE);
return NULL;
}
|
|
From: Mod C. C. L. <mod...@so...> - 2002-07-08 16:59:56
|
Mod Cplusplus CVS committal
Author : gr84b8
Project : mod_cplusplus
Module : src
Dir : mod_cplusplus/src
Modified Files:
mod_cplusplus.c
Log Message:
fix up a bunch of nasty warnings
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/src/mod_cplusplus.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- mod_cplusplus.c 8 Jul 2002 16:51:56 -0000 1.18
+++ mod_cplusplus.c 8 Jul 2002 16:59:55 -0000 1.19
@@ -84,7 +84,7 @@
}
static const char *add_dir_handler(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_config_rec *cmd_rec = (cpp_config_rec *)config;
char **cur_ptr = cmd_rec->handlers;
@@ -96,12 +96,12 @@
return "Too Many Handlers!! Couldn't add handler";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
return NULL;
}
static const char *add_protocol_handler(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_server_rec *server_rec = (cpp_server_rec *)
ap_get_module_config(cmd->server->module_config,
@@ -116,12 +116,12 @@
return "Too Many Handlers!! Couldn't add protocol handler";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name) ;
return NULL;
}
static const char *add_conn_input_filter(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_server_rec *server_rec = (cpp_server_rec *)
ap_get_module_config(cmd->server->module_config,
@@ -136,7 +136,7 @@
return "Too Many Handlers!! Couldn't add input filter";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
ap_register_input_filter(name,
cpp_call_input_filter,
NULL,
@@ -145,7 +145,7 @@
}
static const char *add_conn_output_filter(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_server_rec *server_rec = (cpp_server_rec *)
ap_get_module_config(cmd->server->module_config,
@@ -159,7 +159,7 @@
return "Too Many Handlers!! Couldn't add output filter";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
ap_register_output_filter(name,
cpp_call_output_filter,
NULL,
@@ -168,7 +168,7 @@
}
static const char *add_dir_input_filter(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_config_rec *cmd_rec = (cpp_config_rec *)config;
char **cur_ptr = cmd_rec->input_filters;
@@ -181,7 +181,7 @@
return "Too Many Handlers!! Couldn't add input filter";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
ap_register_input_filter(name,
cpp_call_input_filter,
NULL,
@@ -190,7 +190,7 @@
}
static const char *add_dir_output_filter(cmd_parms *cmd, void *config,
- char *name)
+ const char *name)
{
cpp_config_rec *cmd_rec = (cpp_config_rec *)config;
char **cur_ptr = cmd_rec->output_filters;
@@ -202,7 +202,7 @@
return "Too Many Handlers!! Couldn't add output filter";
}
}
- *cur_ptr = name;
+ *cur_ptr = apr_pstrdup(cmd->pool, name);
ap_register_output_filter(name,
cpp_call_output_filter,
NULL,
@@ -224,7 +224,8 @@
AP_INIT_TAKE1("AddCPPConnectionInputFilter", add_conn_input_filter,
NULL, RSRC_CONF,
"add connection_input filter"),
- AP_INIT_TAKE1("AddCPPConnectionOutputFilter", add_conn_output_filter, NULL,
+ AP_INIT_TAKE1("AddCPPConnectionOutputFilter", add_conn_output_filter,
+ NULL,
RSRC_CONF,
"add connection_output filter"),
AP_INIT_TAKE1("AddCPPProtocol", add_protocol_handler, NULL,
|