Get rid of DEFAULT_XFERLOG as it is not used anywhere. It was

preserved by the build system, printed with "httpd -V", but
apart from that completely ignored: the default transfer log
is to not produce any transfer log.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@95201 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure b/configure
index 647efff709639d708f20051067999f43ee15ffc0..213e8913301a6c058d33620712c6bfc43e87feb6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1251,7 +1251,6 @@ if [ "x$show_layout" = "x1" ]; then
     echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
     echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
     echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
-    echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
     echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
     echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
     echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
@@ -1350,7 +1349,6 @@ echo "echo '-DSHARED_CORE_DIR=\"$libexecdir\"'" >>$src/apaci
 echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
 echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
 echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
-echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
 echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
 echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
 echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci

diff --git a/src/CHANGES b/src/CHANGES
index 95e6a45351416274c705dae9a6bb7e7b87b5dcc6..26c2ddd6f0f8e77206445eccef1063e4be04bd19 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,11 @@
 Changes with Apache 1.3.25
 
+  *) Get rid of DEFAULT_XFERLOG as it is not used anywhere. It was
+     preserved by the build system, printed with "httpd -V", but
+     apart from that completely ignored: the default transfer log
+     is to not produce any transfer log.
+     [Martin Kraemer]
+
   *) Fixed sending of binary files under Cygwin.  PR 9185.
      [Cliff Woolley]
 

diff --git a/src/include/httpd.h b/src/include/httpd.h
index d29d0a77208f612cfa369b532899c8ff4929cd19..eb461002bd9c76c7143fdb60d18cdc7f46c5736c 100644 (file)
--- a/src/include/httpd.h
+++ b/src/include/httpd.h
@@ -158,15 +158,6 @@ extern "C" {
 #define DEFAULT_GROUP "#-1"
 #endif
 
-/* The name of the log files */
-#ifndef DEFAULT_XFERLOG
-#if defined(OS2) || defined(WIN32)
-#define DEFAULT_XFERLOG "logs/access.log"
-#else
-#define DEFAULT_XFERLOG "logs/access_log"
-#endif
-#endif /* DEFAULT_XFERLOG */
-
 #ifndef DEFAULT_ERRORLOG
 #if defined(OS2) || defined(WIN32)
 #define DEFAULT_ERRORLOG "logs/error.log"

diff --git a/src/main/http_main.c b/src/main/http_main.c
index 91ab9265931b3c1c530ef14e8d040c20b6b374f8..f464d43071cb7eafc1a2fe448fc4072d279a6afe 100644 (file)
--- a/src/main/http_main.c
+++ b/src/main/http_main.c
@@ -4112,9 +4112,6 @@ static void show_compile_settings(void)
 #ifdef DEFAULT_LOCKFILE
     printf(" -D DEFAULT_LOCKFILE=\"" DEFAULT_LOCKFILE "\"\n");
 #endif
-#ifdef DEFAULT_XFERLOG
-    printf(" -D DEFAULT_XFERLOG=\"" DEFAULT_XFERLOG "\"\n");
-#endif
 #ifdef DEFAULT_ERRORLOG
     printf(" -D DEFAULT_ERRORLOG=\"" DEFAULT_ERRORLOG "\"\n");
 #endif