summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2002-06-10 18:43:52 +0200
committerJeff Trawick <trawick@apache.org>2002-06-10 18:43:52 +0200
commit4c133221e098462bf8a105dd08acb27bc3b17727 (patch)
treefa54872eea4ba644d40929ae039d33ad71c8dfbb
parentModified the CGIMapExtension directive to take an optional parameter that (diff)
downloadapache2-4c133221e098462bf8a105dd08acb27bc3b17727.tar.xz
apache2-4c133221e098462bf8a105dd08acb27bc3b17727.zip
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
-rw-r--r--CHANGES3
-rw-r--r--server/main.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index a19fa3bc0b..d88a4d198d 100644
--- 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 2fc2e01e09..3648eec3f6 100644
--- 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