Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 29 May 2000 04:17:44 -0000
Message-ID: <20000529041744.25834.qmail@locus.apache.org>
From: wrowe@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/include http_main.h

wrowe       00/05/28 21:17:43

  Modified:    src/main http_main.c
               src/include http_main.h
  Log:
    One last precursor to the common code base for Win32 rewrite_args from
    it's MPM.  Since we need to walk the arg list... why maintain it in
    several places.  This patch adds the AP_SERVER_BASEARGS definition to
    the header, so any mpm (and mod_info, for example) can know what args
    are legitimate, even when they plan to ignore them.
  
  Revision  Changes    Path
  1.51      +6 -2      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- http_main.c	2000/05/28 03:52:41	1.50
  +++ http_main.c	2000/05/29 04:17:39	1.51
  @@ -294,7 +294,7 @@
       ap_pool_t *pconf;
       ap_pool_t *plog; /* Pool of log streams, reset _after_ each read of conf */
       ap_pool_t *ptemp; /* Pool for temporary config stuff, reset often */
  -    ap_pool_t *pcommands; /* Pool for -C and -c switches */
  +    ap_pool_t *pcommands; /* Pool for -D, -C and -c switches */
       module **mod;
   
   #ifndef WIN32 /* done in main_win32.c */
  @@ -322,7 +322,11 @@
   
       ap_run_rewrite_args(process);
   
  -    while (ap_getopt(argc, argv, "C:c:D:d:f:vVlLth?", &c, pcommands) == APR_SUCCESS) {
  +    /* Maintain AP_SERVER_BASEARGS list in http_main.h to allow the MPM 
  +     * to safely pass on our args from its rewrite_args() handler.
  +     */
  +    while (ap_getopt(argc, argv, AP_SERVER_BASEARGS, &c, pcommands) 
  +            == APR_SUCCESS) {
           char **new;
           switch (c) {
    	case 'c':
  
  
  
  1.10      +6 -0      apache-2.0/src/include/http_main.h
  
  Index: http_main.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_main.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- http_main.h	2000/05/27 22:40:20	1.9
  +++ http_main.h	2000/05/29 04:17:41	1.10
  @@ -59,6 +59,12 @@
   #ifndef APACHE_HTTP_MAIN_H
   #define APACHE_HTTP_MAIN_H
   
  +/* AP_SERVER_BASEARGS is the command argument list parsed by http_main.c
  + * in ap_getopt() format.  Use this for default'ing args that the MPM
  + * can safely ignore and pass on from its rewrite_args() handler.
  + */
  +#define AP_SERVER_BASEARGS "C:c:D:d:f:vVlLth?"
  +
   #ifdef __cplusplus
   extern "C" {
   #endif