httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server config.c
Date Tue, 06 Mar 2001 21:46:13 GMT
trawick     01/03/06 13:46:13

  Modified:    .        CHANGES
               server   config.c
  Log:
  Report unbounded containers in the config file.  Previously, a typo
  in the </container> directive could result in the rest of the config
  file being silently ignored, with undesired defaults used.
  
  Revision  Changes    Path
  1.122     +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- CHANGES	2001/03/05 06:16:28	1.121
  +++ CHANGES	2001/03/06 21:46:10	1.122
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.14-dev
   
  +  *) Report unbounded containers in the config file.  Previously, a typo
  +     in the </container> directive could result in the rest of the config
  +     file being silently ignored, with undesired defaults used.
  +     [Jeff Trawick]
  +
     *) Make the old_write filter use the ap_f* functions for the buffering.
        [Ryan Bloom]
   
  
  
  
  1.119     +9 -3      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- config.c	2001/03/03 02:13:49	1.118
  +++ config.c	2001/03/06 21:46:12	1.119
  @@ -1137,14 +1137,20 @@
                                         directive + 1, "> but saw ",
                                         cmd_name, ">", NULL);
                   }
  -                break;
  +                return NULL; /* found end of container */
               }
               else {
  -                ap_soak_end_container(cmd, cmd_name);
  +                const char *msg;
  +
  +                if ((msg = ap_soak_end_container(cmd, cmd_name)) != NULL) {
  +                    return msg;
  +                }
               }
           }
       }
  -    return NULL;
  +    return apr_pstrcat(cmd->pool, "Expected </",
  +                       directive + 1, "> before end of configuration",
  +                       NULL);
   }
   
   static const char *execute_now(char *cmd_line, const char *args, cmd_parms *parms, 
  
  
  

Mime
View raw message