Fix the display of the default name for the mime types config

file.

PR:           9729
Submitted by: Matthew Brecknell <mbrecknell@orchestream.com>
Reviewed by:  Jeff Trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95591 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a19fa3bc0b010d2dc275d6169fd4ae15b09b3bf4..d88a4d198d9f87c75fc2627c3a8b35bb786a254e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 <mbrecknell@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/.)

diff --git a/server/main.c b/server/main.c
index 2fc2e01e09945dd1d55a3f53b3f6a77a7b709339..3648eec3f61c5ea0ba529919198daf195fb22a06 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -230,8 +230,8 @@ static void show_compile_settings(void)
     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