You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2002/06/10 18:43:52 UTC

cvs commit: httpd-2.0/server main.c

trawick     2002/06/10 09:43:52

  Modified:    .        CHANGES
               server   main.c
  Log:
  Fix the display of the default name for the mime types config
  file.
  
  PR:           9729
  Submitted by: Matthew Brecknell <mb...@orchestream.com>
  Reviewed by:  Jeff Trawick
  
  Revision  Changes    Path
  1.817     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.816
  retrieving revision 1.817
  diff -u -r1.816 -r1.817
  --- CHANGES	7 Jun 2002 21:48:20 -0000	1.816
  +++ CHANGES	10 Jun 2002 16:43:51 -0000	1.817
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.37
   
  +  *) Fix the display of the default name for the mime types config
  +     file.  PR 9729  [Matthew Brecknell <mb...@orchestream.com>]
  +
     *) Fix the working directory *for WinNT/2K/XP services only* to
        change to the Apache directory (one level above the location 
        of Apache.exe, in the case that Apache.exe resides in bin/.)
  
  
  
  1.134     +2 -2      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.133
  retrieving revision 1.134
  diff -u -r1.133 -r1.134
  --- main.c	24 May 2002 18:48:10 -0000	1.133
  +++ main.c	10 Jun 2002 16:43:52 -0000	1.134
  @@ -230,8 +230,8 @@
       printf(" -D DEFAULT_ERRORLOG=\"" DEFAULT_ERRORLOG "\"\n");
   #endif
   
  -#ifdef TYPES_CONFIG_FILE
  -    printf(" -D TYPES_CONFIG_FILE=\"" TYPES_CONFIG_FILE "\"\n");
  +#ifdef AP_TYPES_CONFIG_FILE
  +    printf(" -D AP_TYPES_CONFIG_FILE=\"" AP_TYPES_CONFIG_FILE "\"\n");
   #endif
   
   #ifdef SERVER_CONFIG_FILE