httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/support httpd.exp
Date Mon, 26 Mar 2001 15:39:54 GMT
dougm       01/03/26 07:39:53

  Modified:    .        CHANGES
               include  http_config.h
               modules/generators mod_info.c
               server   config.c
               support  httpd.exp
  Log:
  top_module global variable renamed to ap_top_module
  
  Revision  Changes    Path
  1.150     +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- CHANGES	2001/03/25 20:42:45	1.149
  +++ CHANGES	2001/03/26 15:39:39	1.150
  @@ -1,5 +1,7 @@
   Changes with Apache 2.0.16-dev
   
  +  *) top_module global variable renamed to ap_top_module [Perl]
  +
     *) Move ap_set_last_modified to the core.  This is a potentially 
        controversial change, because this is kind of HTTP specific.  However
        many protocols should be able to take advantage of this kind of
  
  
  
  1.72      +2 -2      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.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- http_config.h	2001/02/25 01:12:50	1.71
  +++ http_config.h	2001/03/26 15:39:42	1.72
  @@ -729,9 +729,9 @@
   
   /**
    * The topmost module in the list
  - * @defvar module *top_module
  + * @defvar module *ap_top_module
    */
  -AP_DECLARE_DATA extern module *top_module;
  +AP_DECLARE_DATA extern module *ap_top_module;
   
   /**
    * Array of all statically linked modules
  
  
  
  1.34      +3 -3      httpd-2.0/modules/generators/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_info.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- mod_info.c	2001/03/02 22:46:31	1.33
  +++ mod_info.c	2001/03/26 15:39:45	1.34
  @@ -296,7 +296,7 @@
       if (!r->args || strcasecmp(r->args, "list")) {
           if (!r->args) {
               ap_rputs("<tt><a href=\"#server\">Server Settings</a>, ",
r);
  -            for (modp = top_module; modp; modp = modp->next) {
  +            for (modp = ap_top_module; modp; modp = modp->next) {
                   ap_rprintf(r, "<a href=\"#%s\">%s</a>", modp->name, modp->name);
                   if (modp->next) {
                       ap_rputs(", ", r);
  @@ -337,7 +337,7 @@
   		       "<tt>%s</tt><br>\n", SERVER_CONFIG_FILE);
           }
           ap_rputs("<hr><dl>", r);
  -        for (modp = top_module; modp; modp = modp->next) {
  +        for (modp = ap_top_module; modp; modp = modp->next) {
               if (!r->args || !strcasecmp(modp->name, r->args)) {
                   ap_rprintf(r, "<dt><a name=\"%s\"><strong>Module Name:</strong>
"
                               "<font size=+1><tt>%s</tt></a></font>\n",
  @@ -439,7 +439,7 @@
           }
       }
       else {
  -        for (modp = top_module; modp; modp = modp->next) {
  +        for (modp = ap_top_module; modp; modp = modp->next) {
               ap_rputs(modp->name, r);
               if (modp->next) {
                   ap_rputs("<br>", r);
  
  
  
  1.120     +14 -14    httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- config.c	2001/03/06 21:46:12	1.119
  +++ config.c	2001/03/26 15:39:49	1.120
  @@ -148,7 +148,7 @@
    * than DYNAMIC_MODULE_LIMIT.
    */
   static int dynamic_modules = 0;
  -AP_DECLARE_DATA module *top_module = NULL;
  +AP_DECLARE_DATA module *ap_top_module = NULL;
   AP_DECLARE_DATA module **ap_loaded_modules=NULL;
   
   typedef int (*handler_func) (request_rec *);
  @@ -179,7 +179,7 @@
                                        (total_modules + DYNAMIC_MODULE_LIMIT));
       module *modp;
   
  -    for (modp = top_module; modp; modp = modp->next) {
  +    for (modp = ap_top_module; modp; modp = modp->next) {
   	dir_maker_func df = modp->create_dir_config;
   
   	if (df)
  @@ -198,7 +198,7 @@
       void **new_vector = (void **) new_conf;
       module *modp;
   
  -    for (modp = top_module; modp; modp = modp->next) {
  +    for (modp = ap_top_module; modp; modp = modp->next) {
   	merger_func df = modp->merge_dir_config;
   	int i = modp->module_index;
   
  @@ -217,7 +217,7 @@
                                        (total_modules + DYNAMIC_MODULE_LIMIT));
       module *modp;
   
  -    for (modp = top_module; modp; modp = modp->next) {
  +    for (modp = ap_top_module; modp; modp = modp->next) {
   	if (modp->create_server_config)
   	    conf_vector[modp->module_index] = (*modp->create_server_config) (p, s);
       }
  @@ -236,7 +236,7 @@
       void **virt_vector = (void **) virt;
       module *modp;
   
  -    for (modp = top_module; modp; modp = modp->next) {
  +    for (modp = ap_top_module; modp; modp = modp->next) {
   	merger_func df = modp->merge_server_config;
   	int i = modp->module_index;
   
  @@ -356,8 +356,8 @@
       }
   
       if (m->next == NULL) {
  -	m->next = top_module;
  -	top_module = m;
  +	m->next = ap_top_module;
  +	ap_top_module = m;
       }
       if (m->module_index == -1) {
   	m->module_index = total_modules++;
  @@ -411,10 +411,10 @@
   {
       module *modp;
   
  -    modp = top_module;
  +    modp = ap_top_module;
       if (modp == m) {
   	/* We are the top module, special case */
  -	top_module = modp->next;
  +	ap_top_module = modp->next;
   	m->next = NULL;
       }
       else {
  @@ -539,7 +539,7 @@
   {
       module *modp;
   
  -    for (modp = top_module; modp; modp = modp->next) {
  +    for (modp = ap_top_module; modp; modp = modp->next) {
   	if (strcmp(modp->name, name) == 0)
   	    return modp;
       }
  @@ -786,7 +786,7 @@
       const char *args;
       char *cmd_name;
       ap_directive_t *newdir;
  -    module *mod = top_module;
  +    module *mod = ap_top_module;
       const command_rec *cmd;
   
       if (*l == '#' || *l == '\0')
  @@ -922,7 +922,7 @@
   				      cmd_parms *parms,
                                         ap_conf_vector_t *section_vector)
   {
  -    module *mod = top_module;
  +    module *mod = ap_top_module;
   
       while (1) {
   	const command_rec *cmd;
  @@ -1157,7 +1157,7 @@
                            apr_pool_t *p, apr_pool_t *ptemp, 
                            ap_directive_t **sub_tree, ap_directive_t *parent)
   {
  -    module *mod = top_module;
  +    module *mod = ap_top_module;
       const command_rec *cmd;
   
       if (!(cmd = ap_find_command_in_modules(cmd_line, &mod))) {
  @@ -1625,7 +1625,7 @@
   {
       module *m;
   
  -    for (m = top_module; m; m = m->next)
  +    for (m = ap_top_module; m; m = m->next)
           if (m->rewrite_args)
               (*m->rewrite_args) (process);
   }
  
  
  
  1.30      +1 -1      httpd-2.0/support/httpd.exp
  
  Index: httpd.exp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/httpd.exp,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- httpd.exp	2001/03/06 02:41:47	1.29
  +++ httpd.exp	2001/03/26 15:39:52	1.30
  @@ -600,4 +600,4 @@
   regexec
   regfree
   setenvif_module
  -top_module
  +ap_top_module
  
  
  

Mime
View raw message