Author: wrowe
Date: Tue Oct 2 15:47:50 2007
New Revision: 581423
URL: http://svn.apache.org/viewvc?rev=581423&view=rev
Log:
Filter ordering is still flakey, and not actually required AFAICT (certainly,
not NULL filter ordering!)
Clean up ftp_module declaration syntax.
Modified:
httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c
Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c?rev=581423&r1=581422&r2=581423&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c Tue Oct 2 15:47:50 2007
@@ -904,13 +904,8 @@
static void register_hooks(apr_pool_t *p)
{
- static const char *const pred[] = { "mod_log_config.c",
- NULL };
-
- static const char *const post[] = { NULL };
-
- ap_hook_pre_config(ftp_pre_config, pred, NULL, APR_HOOK_MIDDLE);
- ap_hook_post_config(ftp_post_config, post, NULL, APR_HOOK_MIDDLE);
+ ap_hook_pre_config(ftp_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_post_config(ftp_post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init(ftp_child_init, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_process_connection(ftp_process_connection, NULL, NULL,
APR_HOOK_MIDDLE);
@@ -936,10 +931,11 @@
ftp_register_core_cmds(p);
}
-FTP_DECLARE_DATA module ftp_module = {
+module FTP_DECLARE_DATA ftp_module =
+{
STANDARD20_MODULE_STUFF,
create_ftp_dir_config, /* create per-directory config structure */
- merge_ftp_dir_config, /* merge per-directory config structures */
+ merge_ftp_dir_config, /* merge per-directory config structures */
create_ftp_server_config, /* create per-server config structure */
merge_ftp_server_config, /* merge per-server config structures */
ftp_cmds, /* command apr_table_t */
|