Merge 1621373 from trunk:

mod_slotmem: Increase log level for some originally debug messages.

Submitted by: jim
Reviewed by: jim, ylavic, rjung
Backported by: jailletc36

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

diff --git a/CHANGES b/CHANGES
index 3aa52eaa1591b940c74ad3150c385dc9f9d69461..903f81ca7bf8a6b664a2fe06ed63db2e9d4ea455 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,9 @@ Changes with Apache 2.4.11
      request headers earlier.  Adds "MergeTrailers" directive to restore
      legacy behavior.  [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
 
+  *) mod_slotmem_shm: Increase log level for some originally debug messages.
+     [Jim Jagielski]
+
   *) mod_ldap: In 2.4.10, some LDAP searches or comparisons might be done with
      the wrong credentials when a backend connection is reused.
      [Eric Covener]

diff --git a/STATUS b/STATUS
index 38bb80ab3271192e41828c1bdc9aee0e447f671c..56c9a6eca157c9f15ef591c072fcec4d74ebc04b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -128,12 +128,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
              https://issues.apache.org/bugzilla/attachment.cgi?id=31686).
              Should we?
 
-   * mod_slotmem: Increase log level for some originally debug messages.
-     trunk patch: http://svn.apache.org/r1621373
-     2.4.x patch: trunk works
-                  http://people.apache.org/~jim/patches/slotmem-loglevel.patch
-     +1: jim, ylavic, rjung
-
    * mod_proxy: Make worker name truncation a non-fatal error.
      trunk patch: http://svn.apache.org/r1621367
                   http://svn.apache.org/r1621372

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index b6cfa0a229c3d77272ee8d6be7202f263a77eda2..d0106992884ad28c50738a4a83fc77ab22afb43f 100644 (file)
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -213,19 +213,19 @@ static apr_status_t restore_slotmem(void *ptr, const char *name, apr_size_t size
                         rv = APR_SUCCESS;
                         apr_md5(digest2, ptr, nbytes);
                         if (memcmp(digest, digest2, APR_MD5_DIGESTSIZE)) {
-                            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
+                            ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf,
                                          APLOGNO(02551) "bad md5 match");
                             rv = APR_EGENERAL;
                         }
                     }
                 }
                 else {
-                    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
+                    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf,
                                  APLOGNO(02552) "at EOF... bypassing md5 match check (old persist file?)");
                 }
             }
             else if (nbytes != size) {
-                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf,
+                ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf,
                              APLOGNO(02553) "Expected %" APR_SIZE_T_FMT ": Read %" APR_SIZE_T_FMT,
                              size, nbytes);
                 rv = APR_EGENERAL;