httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject cvs commit: httpd-2.0 CHANGES
Date Fri, 16 Feb 2001 13:38:34 GMT
martin      01/02/16 05:38:33

  Modified:    modules/aaa config.m4 mod_auth_anon.c mod_auth_db.c
                        mod_auth_dbm.c mod_auth_digest.c
               modules/filters config.m4 mod_include.c mod_include.h
               modules/loggers config.m4 mod_log_config.c
               modules/mappers config.m4 mod_actions.c
               .        CHANGES
  Log:
  Rename the module structures so that the exported symbol matches
  the file name, and it is easier to automate the installation
  process (generating LoadModule directives from the module filenames).
  
  Next step is to remove the 4th argument to the APACHE_MODULE macro
  completely and require people to use the matching names, and to
  reduce the LoadModule directive to 1 argument.... Objections?
  
  Revision  Changes    Path
  1.38      +4 -4      httpd-2.0/modules/aaa/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/config.m4,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -u -r1.37 -r1.38
  --- config.m4	2000/12/22 21:34:09	1.37
  +++ config.m4	2001/02/16 13:38:14	1.38
  @@ -6,15 +6,15 @@
   
   APACHE_MODULE(access, host-based access control, , , yes)
   APACHE_MODULE(auth, user-based access control, , , yes)
  -APACHE_MODULE(auth_anon, anonymous user access, , anon_auth, no)
  -APACHE_MODULE(auth_dbm, DBM-based access databases, , dbm_auth, no)
  +APACHE_MODULE(auth_anon, anonymous user access, , , no)
  +APACHE_MODULE(auth_dbm, DBM-based access databases, , , no)
   
  -APACHE_MODULE(auth_db, DB-based access databases, , db_auth, no, [
  +APACHE_MODULE(auth_db, DB-based access databases, , , no, [
     AC_CHECK_HEADERS(db.h)
     AC_CHECK_LIB(db,main)
   ]) 
   
  -APACHE_MODULE(auth_digest, digests, , digest_auth, no)
  +APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , no)
   
   LTFLAGS="$LTFLAGS -export-dynamic"
   
  
  
  
  1.26      +4 -4      httpd-2.0/modules/aaa/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_anon.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -u -r1.25 -r1.26
  --- mod_auth_anon.c	2001/02/16 04:26:34	1.25
  +++ mod_auth_anon.c	2001/02/16 13:38:14	1.26
  @@ -217,13 +217,13 @@
       {NULL}
   };
   
  -module AP_MODULE_DECLARE_DATA anon_auth_module;
  +module AP_MODULE_DECLARE_DATA auth_anon_module;
   
   static int anon_authenticate_basic_user(request_rec *r)
   {
       anon_auth_config_rec *sec =
       (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config,
  -					       &anon_auth_module);
  +					       &auth_anon_module);
       const char *sent_pw;
       int res = DECLINED;
   
  @@ -284,7 +284,7 @@
       conn_rec *c = r->connection;
       anon_auth_config_rec *sec =
       (anon_auth_config_rec *) ap_get_module_config(r->per_dir_config,
  -					       &anon_auth_module);
  +					       &auth_anon_module);
   
       if (!sec->anon_auth)
   	return DECLINED;
  @@ -303,7 +303,7 @@
       ap_hook_auth_checker(check_anon_access,NULL,NULL,APR_HOOK_MIDDLE);
   }
   
  -module AP_MODULE_DECLARE_DATA anon_auth_module =
  +module AP_MODULE_DECLARE_DATA auth_anon_module =
   {
       STANDARD20_MODULE_STUFF,
       create_anon_auth_dir_config,/* dir config creater */
  
  
  
  1.27      +5 -5      httpd-2.0/modules/aaa/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_db.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -u -r1.26 -r1.27
  --- mod_auth_db.c	2001/02/16 04:26:34	1.26
  +++ mod_auth_db.c	2001/02/16 13:38:15	1.27
  @@ -75,7 +75,7 @@
    *           instead of   AuthDBMUserFile    AuthDBMGroupFile
    *
    * Also, in the configuration file you need to specify
  - *  db_auth_module rather than auth_dbm_module
  + *  auth_db_module rather than auth_dbm_module
    *
    * On some BSD systems (e.g. FreeBSD and NetBSD) dbm is automatically
    * mapped to Berkeley DB. You can use either mod_auth_dbm or
  @@ -161,7 +161,7 @@
       {NULL}
   };
   
  -module db_auth_module;
  +module auth_db_module;
   
   static char *get_db_pw(request_rec *r, char *user, const char *auth_dbpwfile)
   {
  @@ -293,7 +293,7 @@
   {
       db_auth_config_rec *sec =
       (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
  -						&db_auth_module);
  +						&auth_db_module);
       const char *sent_pw;
       char *real_pw, *colon_pw;
       apr_status_t invalid_pw;
  @@ -341,7 +341,7 @@
   {
       db_auth_config_rec *sec =
       (db_auth_config_rec *) ap_get_module_config(r->per_dir_config,
  -						&db_auth_module);
  +						&auth_db_module);
       char *user = r->user;
       int m = r->method_number;
   
  @@ -404,7 +404,7 @@
       ap_hook_auth_checker(db_check_auth,NULL,NULL,APR_HOOK_MIDDLE);
   }
   
  -module db_auth_module =
  +module auth_db_module =
   {
       STANDARD20_MODULE_STUFF,
       create_db_auth_dir_config,	/* dir config creater */
  
  
  
  1.30      +5 -5      httpd-2.0/modules/aaa/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_dbm.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -u -r1.29 -r1.30
  --- mod_auth_dbm.c	2001/02/16 04:26:34	1.29
  +++ mod_auth_dbm.c	2001/02/16 13:38:15	1.30
  @@ -101,7 +101,7 @@
    *
    * XXX: this needs updating for apache-2.0 configuration method
    * MODULE-DEFINITION-START
  - * Name: dbm_auth_module
  + * Name: auth_dbm_module
    * ConfigStart
       . ./helpers/find-dbm-lib
    * ConfigEnd
  @@ -156,7 +156,7 @@
       {NULL}
   };
   
  -module AP_MODULE_DECLARE_DATA dbm_auth_module;
  +module AP_MODULE_DECLARE_DATA auth_dbm_module;
   
   static char *get_dbm_pw(request_rec *r, char *user, char *auth_dbmpwfile)
   {
  @@ -237,7 +237,7 @@
   {
       dbm_auth_config_rec *sec =
       (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
  -					      &dbm_auth_module);
  +					      &auth_dbm_module);
       const char *sent_pw;
       char *real_pw, *colon_pw;
       apr_status_t invalid_pw;
  @@ -280,7 +280,7 @@
   {
       dbm_auth_config_rec *sec =
       (dbm_auth_config_rec *) ap_get_module_config(r->per_dir_config,
  -					      &dbm_auth_module);
  +					      &auth_dbm_module);
       char *user = r->user;
       int m = r->method_number;
   
  @@ -344,7 +344,7 @@
       ap_hook_auth_checker(dbm_check_auth, NULL, NULL, APR_HOOK_MIDDLE);
   }
   
  -module AP_MODULE_DECLARE_DATA dbm_auth_module =
  +module AP_MODULE_DECLARE_DATA auth_dbm_module =
   {
       STANDARD20_MODULE_STUFF,
       create_dbm_auth_dir_config,	/* dir config creater */
  
  
  
  1.38      +9 -9      httpd-2.0/modules/aaa/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -u -r1.37 -r1.38
  --- mod_auth_digest.c	2001/02/16 04:26:34	1.37
  +++ mod_auth_digest.c	2001/02/16 13:38:15	1.38
  @@ -262,7 +262,7 @@
   static long num_buckets = DEF_NUM_BUCKETS;
   
   
  -module AP_MODULE_DECLARE_DATA digest_auth_module;
  +module AP_MODULE_DECLARE_DATA auth_digest_module;
   
   /*
    * initialization code
  @@ -966,7 +966,7 @@
       resp->raw_request_uri = r->unparsed_uri;
       resp->psd_request_uri = &r->parsed_uri;
       resp->needed_auth = 0;
  -    ap_set_module_config(r->request_config, &digest_auth_module, resp);
  +    ap_set_module_config(r->request_config, &auth_digest_module, resp);
   
       res = get_digest_rec(r, resp);
       resp->client = get_client(resp->opaque_num, r);
  @@ -1577,14 +1577,14 @@
       while (mainreq->main != NULL)  mainreq = mainreq->main;
       while (mainreq->prev != NULL)  mainreq = mainreq->prev;
       resp = (digest_header_rec *) ap_get_module_config(mainreq->request_config,
  -						      &digest_auth_module);
  +						      &auth_digest_module);
       resp->needed_auth = 1;
   
   
       /* get our conf */
   
       conf = (digest_config_rec *) ap_get_module_config(r->per_dir_config,
  -						      &digest_auth_module);
  +						      &auth_digest_module);
   
   
       /* check for existence and syntax of Auth header */
  @@ -1813,7 +1813,7 @@
   {
       const digest_config_rec *conf =
   		(digest_config_rec *) ap_get_module_config(r->per_dir_config,
  -							   &digest_auth_module);
  +							   &auth_digest_module);
       const char *user = r->user;
       int m = r->method_number;
       int method_restricted = 0;
  @@ -1883,7 +1883,7 @@
   
       note_digest_auth_failure(r, conf,
   	(digest_header_rec *) ap_get_module_config(r->request_config,
  -						   &digest_auth_module),
  +						   &auth_digest_module),
   	0);
       return HTTP_UNAUTHORIZED;
   }
  @@ -1908,10 +1908,10 @@
   {
       const digest_config_rec *conf =
   		(digest_config_rec *) ap_get_module_config(r->per_dir_config,
  -							   &digest_auth_module);
  +							   &auth_digest_module);
       digest_header_rec *resp =
   		(digest_header_rec *) ap_get_module_config(r->request_config,
  -							   &digest_auth_module);
  +							   &auth_digest_module);
       const char *ai = NULL, *digest = NULL, *nextnonce = "";
   
       if (resp == NULL || !resp->needed_auth || conf == NULL)
  @@ -2065,7 +2065,7 @@
       ap_hook_fixups(add_auth_info, NULL, NULL, APR_HOOK_MIDDLE);
   }
   
  -module AP_MODULE_DECLARE_DATA digest_auth_module =
  +module AP_MODULE_DECLARE_DATA auth_digest_module =
   {
       STANDARD20_MODULE_STUFF,
       create_digest_dir_config,	/* dir config creater */
  
  
  
  1.4       +1 -1      httpd-2.0/modules/filters/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/config.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- config.m4	2000/12/07 10:39:54	1.3
  +++ config.m4	2001/02/16 13:38:20	1.4
  @@ -4,7 +4,7 @@
   
   APACHE_MODPATH_INIT(filters)
   
  -APACHE_MODULE(include, Server Side Includes, , includes, yes)
  +APACHE_MODULE(include, Server Side Includes, , , yes)
   
   LTFLAGS="$LTFLAGS -export-dynamic"
   
  
  
  
  1.99      +8 -8      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -u -r1.98 -r1.99
  --- mod_include.c	2001/02/16 04:26:37	1.98
  +++ mod_include.c	2001/02/16 13:38:21	1.99
  @@ -91,7 +91,7 @@
   #include "mod_include.h"
   #include "util_ebcdic.h"
   
  -module AP_MODULE_DECLARE_DATA includes_module;
  +module AP_MODULE_DECLARE_DATA include_module;
   static apr_hash_t *include_hash;
   static APR_OPTIONAL_FN_TYPE(ap_register_include_handler) *ssi_pfn_register;
   
  @@ -812,7 +812,7 @@
                   /* Basically, it puts a bread crumb in here, then looks */
                   /*   for the crumb later to see if its been here.       */
       	    if (rr) 
  -    		ap_set_module_config(rr->request_config, &includes_module, r);
  +    		ap_set_module_config(rr->request_config, &include_module, r);
   
                   if (!error_fmt) {
                       SPLIT_AND_PASS_PRETAG_BUCKETS(*bb, ctx, f->next);
  @@ -829,7 +829,7 @@
   
       	    /* destroy the sub request if it's not a nested include (crumb) */
                   if (rr != NULL
  -    		&& ap_get_module_config(rr->request_config, &includes_module)
  +    		&& ap_get_module_config(rr->request_config, &include_module)
       		    != NESTED_INCLUDE_MAGIC) {
       		ap_destroy_sub_req(rr);
                   }
  @@ -2619,7 +2619,7 @@
    * option only changes the default.
    */
   
  -module includes_module;
  +module include_module;
   enum xbithack {
       xbithack_off, xbithack_on, xbithack_full
   };
  @@ -2662,7 +2662,7 @@
       request_rec *r = f->r;
       include_ctx_t *ctx = f->ctx;
       enum xbithack *state =
  -    (enum xbithack *) ap_get_module_config(r->per_dir_config, &includes_module);
  +    (enum xbithack *) ap_get_module_config(r->per_dir_config, &include_module);
       request_rec *parent;
   
       if (!(ap_allow_options(r) & OPT_INCLUDES)) {
  @@ -2701,7 +2701,7 @@
           ap_set_last_modified(r);
       }
   
  -    if ((parent = ap_get_module_config(r->request_config, &includes_module))) {
  +    if ((parent = ap_get_module_config(r->request_config, &include_module))) {
   	/* Kludge --- for nested includes, we want to keep the subprocess
   	 * environment of the base document (for compatibility); that means
   	 * torquing our own last_modified date as well so that the
  @@ -2732,7 +2732,7 @@
   
       if (parent) {
   	/* signify that the sub request should not be killed */
  -	ap_set_module_config(r->request_config, &includes_module,
  +	ap_set_module_config(r->request_config, &include_module,
   	    NESTED_INCLUDE_MAGIC);
       }
   
  @@ -2785,7 +2785,7 @@
       ap_register_output_filter("INCLUDES", includes_filter, AP_FTYPE_CONTENT);
   }
   
  -module AP_MODULE_DECLARE_DATA includes_module =
  +module AP_MODULE_DECLARE_DATA include_module =
   {
       STANDARD20_MODULE_STUFF,
       create_includes_dir_config, /* dir config creater */
  
  
  
  1.13      +1 -1      httpd-2.0/modules/filters/mod_include.h
  
  Index: mod_include.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -u -r1.12 -r1.13
  --- mod_include.h	2001/02/16 04:26:38	1.12
  +++ mod_include.h	2001/02/16 13:38:22	1.13
  @@ -74,7 +74,7 @@
   #endif /*APR_CHARSET_EBCDIC*/
   
   /* just need some arbitrary non-NULL pointer which can't also be a request_rec */
  -#define NESTED_INCLUDE_MAGIC	(&includes_module)
  +#define NESTED_INCLUDE_MAGIC	(&include_module)
   
   /****************************************************************************
    * Used to keep context information during parsing of a request for SSI tags.
  
  
  
  1.4       +1 -1      httpd-2.0/modules/loggers/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/config.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- config.m4	2000/12/07 10:39:57	1.3
  +++ config.m4	2001/02/16 13:38:25	1.4
  @@ -4,6 +4,6 @@
   
   APACHE_MODPATH_INIT(loggers)
   	
  -APACHE_MODULE(log_config, logging configuration, , config_log, yes)
  +APACHE_MODULE(log_config, logging configuration, , , yes)
   
   APACHE_MODPATH_FINISH
  
  
  
  1.50      +7 -7      httpd-2.0/modules/loggers/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -u -r1.49 -r1.50
  --- mod_log_config.c	2001/02/16 04:26:40	1.49
  +++ mod_log_config.c	2001/02/16 13:38:25	1.50
  @@ -201,7 +201,7 @@
   
   #define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b"
   
  -module AP_MODULE_DECLARE_DATA config_log_module;
  +module AP_MODULE_DECLARE_DATA log_config_module;
   
   static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE);
   static apr_fileperms_t xfer_perms = APR_OS_DEFAULT;
  @@ -952,7 +952,7 @@
   static int multi_log_transaction(request_rec *r)
   {
       multi_log_state *mls = ap_get_module_config(r->server->module_config,
  -						&config_log_module);
  +						&log_config_module);
       config_log_state *clsarray;
       int i;
   
  @@ -1028,7 +1028,7 @@
   {
       const char *err_string = NULL;
       multi_log_state *mls = ap_get_module_config(cmd->server->module_config,
  -						&config_log_module);
  +						&log_config_module);
   
       /*
        * If we were given two arguments, the second is a name to be given to the
  @@ -1054,7 +1054,7 @@
   {
       const char *err_string = NULL;
       multi_log_state *mls = ap_get_module_config(cmd->server->module_config,
  -						&config_log_module);
  +						&log_config_module);
       config_log_state *cls;
   
       cls = (config_log_state *) apr_array_push(mls->config_logs);
  @@ -1151,7 +1151,7 @@
   {
       int i;
       multi_log_state *mls = ap_get_module_config(s->module_config,
  -                                             &config_log_module);
  +                                             &log_config_module);
       config_log_state *clsarray;
       const char *dummy;
       const char *format;
  @@ -1211,7 +1211,7 @@
       int i;
   
       for (; s; s = s->next) {
  -        mls = ap_get_module_config(s->module_config, &config_log_module);
  +        mls = ap_get_module_config(s->module_config, &log_config_module);
           log_list = NULL;
           if (mls->config_logs->nelts) {
               log_list = mls->config_logs;
  @@ -1260,7 +1260,7 @@
       ap_hook_log_transaction(multi_log_transaction,NULL,NULL,APR_HOOK_MIDDLE);
   }
   
  -module AP_MODULE_DECLARE_DATA config_log_module =
  +module AP_MODULE_DECLARE_DATA log_config_module =
   {
       STANDARD20_MODULE_STUFF,
       NULL,                       /* create per-dir config */
  
  
  
  1.3       +1 -1      httpd-2.0/modules/mappers/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/config.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- config.m4	2000/12/07 10:31:16	1.2
  +++ config.m4	2001/02/16 13:38:28	1.3
  @@ -8,7 +8,7 @@
   APACHE_MODULE(negotiation, content negoatiation, , , yes)
   APACHE_MODULE(dir, directory request handling, , , yes)
   APACHE_MODULE(imap, internal imagemaps, , , yes)
  -APACHE_MODULE(actions, Action triggering on requests, , action, yes)
  +APACHE_MODULE(actions, Action triggering on requests, , , yes)
   APACHE_MODULE(speling, correct common URL misspellings, , , no)
   APACHE_MODULE(userdir, mapping of user requests, , , yes)
   APACHE_MODULE(alias, translation of requests, , , yes)
  
  
  
  1.23      +3 -3      httpd-2.0/modules/mappers/mod_actions.c
  
  Index: mod_actions.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_actions.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -u -r1.22 -r1.23
  --- mod_actions.c	2001/02/16 04:26:40	1.22
  +++ mod_actions.c	2001/02/16 13:38:28	1.23
  @@ -94,7 +94,7 @@
       const char *scripted[METHODS];   /* Added with Script... */
   } action_dir_config;
   
  -module action_module;
  +module actions_module;
   
   static void *create_action_dir_config(apr_pool_t *p, char *dummy)
   {
  @@ -161,7 +161,7 @@
   static int action_handler(request_rec *r)
   {
       action_dir_config *conf = (action_dir_config *)
  -        ap_get_module_config(r->per_dir_config, &action_module);
  +        ap_get_module_config(r->per_dir_config, &actions_module);
       const char *t, *action = r->handler ? r->handler : 
   	ap_field_noparam(r->pool, r->content_type);
       const char *script;
  @@ -214,7 +214,7 @@
       ap_hook_handler(action_handler,NULL,NULL,APR_HOOK_LAST);
   }
   
  -module action_module =
  +module actions_module =
   {
       STANDARD20_MODULE_STUFF,
       create_action_dir_config,	/* dir config creater */
  
  
  
  1.94      +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -u -r1.93 -r1.94
  --- CHANGES	2001/02/15 23:13:25	1.93
  +++ CHANGES	2001/02/16 13:38:31	1.94
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.12-dev
   
  +  *) Rename the module structures so that the exported symbol matches
  +     the file name, and it is easier to automate the installation
  +     process (generating LoadModule directives from the module filenames).
  +     [Martin Kraemer]
  +
     *) Remove the coalesce filter.  With the ap_f* functions, this filter
        is no longer needed. [Ryan Bloom]
   
  
  
  

Mime
View raw message