httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/server config.c
Date Sun, 21 Jan 2001 22:14:17 GMT
rbb         01/01/21 14:14:17

  Modified:    .        CHANGES STATUS
               include  http_config.h
               modules/http http_core.c
               server   config.c
  Log:
  Remove AddModule and ClearModuleList.  Neither directive really makes
  much sense anymore, since we use the hooks to order modules correctly.
  This also removes the possability that one module will ever register the
  same function for the same hook twice.
  
  Revision  Changes    Path
  1.51      +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -d -b -w -u -r1.50 -r1.51
  --- CHANGES	2001/01/21 17:22:16	1.50
  +++ CHANGES	2001/01/21 22:14:12	1.51
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0b1
   
  +  *) Remove AddModule and ClearModuleList directives.  Both of these
  +     directives were used to ensure that modules could be enabled
  +     in the correct order.  That requirement is now gone, because
  +     we use hooks to ensure that modules are in the correct order.
  +     [Ryan Bloom]
  +
     *) When SuExec is specified, we need to add it to the list of
        targets to be built.  If we don't, then any changes to the
        configuration won't affect SuExec, unless 'make suexec' is
  
  
  
  1.190     +1 -10     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.189
  retrieving revision 1.190
  diff -u -d -b -w -u -r1.189 -r1.190
  --- STATUS	2001/01/21 17:51:08	1.189
  +++ STATUS	2001/01/21 22:14:13	1.190
  @@ -1,5 +1,5 @@
   APACHE 2.0 STATUS:						-*-text-*-
  -Last modified at [$Date: 2001/01/21 17:51:08 $]
  +Last modified at [$Date: 2001/01/21 22:14:13 $]
   
   Release:
   
  @@ -191,15 +191,6 @@
         added multiple times during the config process. The -export-dynamic
         should probably move into build/special.mk (the make file used for
         building Apache modules).
  -
  -    * toss the AddModule directive. we add all prelinked modules
  -      automatically, and the LoadModule directive now implies
  -      AddModule. so... there is no point to it any more.
  -        RBB says:  We do not add all prelinked modules back after
  -                   a clear module list.  If we remove AddModule, we
  -                   also need to remove ClearModuleList, because
  -                   it wouldn't make any sense.
  -
   
   PRs that have been suspended forever waiting for someone to
   put them into 'the next release':
  
  
  
  1.60      +0 -6      httpd-2.0/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -d -b -w -u -r1.59 -r1.60
  --- http_config.h	2001/01/19 13:43:39	1.59
  +++ http_config.h	2001/01/21 22:14:14	1.60
  @@ -568,12 +568,6 @@
    */
   AP_DECLARE(int) ap_add_named_module(const char *name, apr_pool_t *p);
   /**
  - * Clear all of the modules from the loaded module list 
  - * @param p The pool valid for the lifetime of the modules
  - * @deffunc void ap_add_named_module(apr_pool_t *p)
  - */
  -AP_DECLARE(void) ap_clear_module_list(apr_pool_t *p);
  -/**
    * Find the name of the specified module
    * @param m The module to get the name for
    * @return the name of the module
  
  
  
  1.240     +0 -32     httpd-2.0/modules/http/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_core.c,v
  retrieving revision 1.239
  retrieving revision 1.240
  diff -u -d -b -w -u -r1.239 -r1.240
  --- http_core.c	2001/01/19 07:04:21	1.239
  +++ http_core.c	2001/01/21 22:14:15	1.240
  @@ -1895,34 +1895,6 @@
       return NULL;
   }
   
  -static const char *add_module_command(cmd_parms *cmd, void *dummy,
  -				      const char *arg)
  -{
  -    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
  -    if (err != NULL) {
  -        return err;
  -    }
  -
  -    if (!ap_add_named_module(arg, cmd->pool)) {
  -	return apr_pstrcat(cmd->pool, "Cannot add module via name '", arg, 
  -			  "': not in list of loaded modules", NULL);
  -    }
  -    *(ap_directive_t **)dummy = NULL;
  -    return NULL;
  -}
  -
  -static const char *clear_module_list_command(cmd_parms *cmd, void *dummy)
  -{
  -    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
  -    if (err != NULL) {
  -        return err;
  -    }
  -
  -    ap_clear_module_list(cmd->pool);
  -    *(ap_directive_t **)dummy = NULL;
  -    return NULL;
  -}
  -
   static const char *set_server_string_slot(cmd_parms *cmd, void *dummy,
   					  const char *arg)
   {
  @@ -2849,10 +2821,6 @@
     RSRC_CONF|ACCESS_CONF,
     "How to work out the ServerName : Port when constructing URLs"),
   /* TODO: RlimitFoo should all be part of mod_cgi, not in the core */
  -AP_INIT_ITERATE("AddModule", add_module_command, NULL,
  -  RSRC_CONF, "The name of a module"),
  -AP_INIT_NO_ARGS("ClearModuleList", clear_module_list_command, NULL,
  -  RSRC_CONF, NULL),
   /* TODO: ListenBacklog in MPM */
   AP_INIT_TAKE1("Include", include_config, NULL,
     (RSRC_CONF | ACCESS_CONF | EXEC_ON_READ),
  
  
  
  1.104     +0 -18     httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -d -b -w -u -r1.103 -r1.104
  --- config.c	2001/01/21 05:21:32	1.103
  +++ config.c	2001/01/21 22:14:16	1.104
  @@ -579,24 +579,6 @@
       return 0;
   }
   
  -/* Clear the internal list of modules, in preparation for starting over. */
  -AP_DECLARE(void) ap_clear_module_list(apr_pool_t *p)
  -{
  -    module **m = &top_module;
  -    module **next_m;
  -
  -    while (*m) {
  -	next_m = &((*m)->next);
  -	*m = NULL;
  -	m = next_m;
  -    }
  -
  -    apr_hook_deregister_all();
  -
  -    /* This is required; so we add it always.  */
  -    ap_add_named_module("http_core.c", p);
  -}
  -
   /*****************************************************************
    *
    * Resource, access, and .htaccess config files now parsed by a common
  
  
  

Mime
View raw message