ignore APLOG_NOERRNO; note that it is deprecated

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

diff --git a/CHANGES b/CHANGES
index 54edae8cb4d64e79e29c7961e4c1e015c5061022..87f22857ce831bdb96a905d122329b6474392d65 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.37
 
+  *) The APLOG_NOERRNO flag to ap_log_[r]error() is now deprecated.
+     It is currently ignored and it will be removed in a future release
+     of Apache.  [Jeff Trawick]
+
   *) Removed documentation references to the no-longer-supported
      "make certificate" feature of mod_ssl for Apache 1.3.x.  Test
      certificates, if truly desired, can be generated using openssl

diff --git a/include/http_log.h b/include/http_log.h
index 68feb2edaef6e417e06f186a606282da38df044d..8eb1d96a5eb8bf138f25a07f88f712f3ff4d20ab 100644 (file)
--- a/include/http_log.h
+++ b/include/http_log.h
@@ -102,6 +102,9 @@ extern "C" {
 
 #endif
 
+/* APLOG_NOERRNO is ignored and should not be used.  It will be
+ * removed in a future release of Apache.
+ */
 #define APLOG_NOERRNO          (APLOG_LEVELMASK + 1)
 
 /* Use APLOG_TOCLIENT to cause ap_log_rerror() to send the message

diff --git a/server/log.c b/server/log.c
index fd2ed35ae636f72bbb2920671f5bd275d4beba03..c78411dc683896a92880a164d66f09e306156b14 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -491,7 +491,7 @@ static void log_error_core(const char *file, int line, int level,
         len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
                             "[client %s] ", r->connection->remote_ip);
     }
-    if (!(level & APLOG_NOERRNO) && (status != 0)) {
+    if (status != 0) {
         char buf[120];
         len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
                             "(%d)%s: ", status,